Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wallabag: Update Wallabag to 2.3.8 and various fixes #4179

Merged
merged 5 commits into from
Sep 22, 2020

Conversation

publicarray
Copy link
Member

@publicarray publicarray commented Sep 14, 2020

  • update Wallabag to 2.3.8
  • incorrect mysql password fix
  • various fixes
  • migrated to generic service script

Linked issues: #3113, #3400, #3054

Build: https://github.com/publicarray/spksrc/releases/tag/wallabag-2.3.8

Checklist

  • Build rule all-supported completed successfully
  • Package upgrade completed successfully
  • New installation of package completed successfully

@publicarray publicarray added status/needs-review update request to update existing package labels Sep 15, 2020
@ymartin59
Copy link
Contributor

@publicarray Thanks for contribution. In fact I understand it is important to keep MySQL support because of previous version installation upgrade, but I would find more resource-effective to deliver package with PostgreSQL support by default, connected to DSM embedded version like for nextcloud PR #3853

In fact, I dream about a generic wizard process (shell script based) where user may select its database from a list (generated from available services in DSM): embedded postgresql, mariadb, sqlite, own package postgresql 11... with backup/restore support when uninstall/install. It would make sense for many applications...

Comment on lines 25 to 26
INSTALL_DEP_SERVICES = apache-web mysql
START_DEP_SERVICES = apache-web mysql
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not enforce mysql dependency for users expecting to connect to embedded postgresql

@publicarray
Copy link
Member Author

Yes that is a good idea, How about we merge this PR first to fix the package (currently it's broken) and later I can work postgresql in a separate PR?

@publicarray
Copy link
Member Author

publicarray commented Sep 20, 2020

@ymartin59
Copy link
Contributor

ymartin59 commented Sep 20, 2020

In fact my idea is to have a "generic database support" in framework (like for service) that a package may re-use to avoid copy/paste... and sqlite may be useful for other application like ffsync

@publicarray
Copy link
Member Author

publicarray commented Sep 21, 2020

@ymartin59 I understand, but how about we do this one step at a time 😅

  1. Fix this package as is
  2. add ability to also select PostgreSQL, SQLite and Redis (for parallel importing support) for this package on install (no migration between DBMS)
  3. generate the necessary files/variables from the framework - also checkout https://help.synology.com/developer-guide/resource_acquisition/maria_db.html

PS I did not know that PostgreSQL is already installed

@ymartin59
Copy link
Contributor

Yes I agree. I will do some testing on this PR and publish first.
I am aware about "resource acquisition" and I guess a shell-based wizard should be able to generate require file according to user's answer "but" it would be probably easier to do all operations (connection and DB creation) in a single place in pre_install step after wizard - when we expect to use our on PostgreSQL package version or SQLite when available...

@ymartin59 ymartin59 merged commit 272d8b6 into SynoCommunity:master Sep 22, 2020
@ymartin59
Copy link
Contributor

@publicarray I just discover GH action does not build non-arch package and package fails to build on my system... I still do not know why

@ymartin59
Copy link
Contributor

Found: ARCH should not be override in cross/wallabag

@@ -1,34 +1,64 @@
parameters:
database_driver: pdo_mysql
database_driver_class: ~
database_host: 127.0.0.1
database_port: 3306
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad luck. On my test system, I have installed both MariaDB 5 and 10... so port is 3307 now

@ymartin59
Copy link
Contributor

I have published package

@emo1509
Copy link

emo1509 commented Nov 15, 2020

I get following error when installing the package on my DS2018+ : Failed to install wallabag. See errors at /var/services/web/wallabag/install.log
wallabag install.log

@publicarray
Copy link
Member Author

publicarray commented Nov 15, 2020

From the log you need to check your database configuration. Do you have MariaDB installed? Check the port number and maybe you need to reset the password and try again?

Checked                  Status   Recommendation
 ------------------------ -------- ----------------------------------------------------------------------------------------------------------
  PDO Driver (pdo_mysql)   OK!
  Database connection      ERROR!   Can't connect to the database: An exception occured in driver: SQLSTATE[HY000] [2002] Connection refused
  Database version         OK!
  curl_exec                OK!
  curl_multi_init          OK!

@emo1509
Copy link

emo1509 commented Nov 20, 2020

I'm running MariaDB10 on Synology (port 3307). Do I need to create user & database first or will it be created by the package ?

@publicarray
Copy link
Member Author

Change your port to 3306 (this is the default Mariadb port but because Synology has 2 Mariadb versions they changed the port number so they can be run side by side.)

And the wallabag install script will create the database and user for you.

@emo1509
Copy link

emo1509 commented Nov 21, 2020

I have now also installed MariaDB 5 on my NAS which uses by default port 3306. I also have MariaDB 10 running because already created several databases in there for other applications. If both are running and I install Wallabag package , he creates user wallabag and database name (not yet the structure) wallabag in MariaDB 10 (which runs on port 3307). If I stop MariaDB 10 and try to install the package again, I get error message "Failed to install Wallabag. Incorrect MySQL root password." I would have expected that in the second case he would try to create user and database in the MariaDB 5.

@jamallonon
Copy link

I am having the same plain HTML issue described here: wallabag/wallabag#4061 . What do you guys have configured for SYMFONY__ENV__DOMAIN_NAME?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/needs-review update request to update existing package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants