Testing: update to 2.4.3 (#128)

* Apply last example_ynh (#117) * Apply last example_ynh * Cleanup backup * Create DISCLAIMER.md * Create DISCLAIMER_fr.md * Auto-update README * Add files via upload * Fix heading size * Auto-update README * Fix heading size * Auto-update README * Fix charset * Auto-update README * Update check_process * 2.4.3 (#125) * Upgrade to 2.4.2~ynh1 * Fix craue_config_setting * Upgrade to 2.4.3~ynh1 * Upgrade to 2.4.3~ynh1 * Auto-update README Co-authored-by: yalh76 <yalh@yahoo.com> Co-authored-by: Yunohost-Bot <> * Specify PHP version in every calls (#132) * Specify PHP version in every calls * Switch (back) to php7.4 * Add PHP-xml dependency for DOM extension Co-authored-by: lapineige <lapineige@users.noreply.github.com> * Auto-update README * Fix php version reference (#136) * Auto-update README * Use YNH_PHP_VERSION * Proper YNH_PHP_VERSION syntax * Proper YNH_PHP_VERSION syntax : typo * YNH_PHP_VERSION: fix missing change * Fix phpversion → YNH_PHP_VERSION Co-authored-by: yalh76 <yalh@yahoo.com> Co-authored-by: Yunohost-Bot <> Co-authored-by: tituspijean <tituspijean@outlook.com> Co-authored-by: yunohost-bot <yunohost@yunohost.org>
2024-10-01 13:35:06 +02:00 · 2022-07-23 18:15:11 +02:00 · 2022-07-23 18:15:11 +02:00 · c74b2c2927
commit c74b2c2927
parent 071abab1d6
8 changed files with 41 additions and 33 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Wallabag for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Working status](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg)  
 [![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2)

 *[Lire ce readme en français.](./README_fr.md)*
@ -21,13 +21,13 @@ It extracts content so that you can read it when you have time.
 It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo).


-**Shipped version:** 2.3.8~ynh4
+**Shipped version:** 2.4.3~ynh1

 **Demo:** https://demo.yunohost.org/wallabag/

 ## Screenshots

-![](./doc/screenshots/screenshot1.webp)
+![Screenshot of Wallabag](./doc/screenshots/screenshot1.webp)

 ## Disclaimers / important information

@ -51,21 +51,22 @@ In addition to Wallabag core features, the following are made available with thi
 Warning : Doing a normal upgrade of the package with the web admin or `sudo yunohost app upgrade wallabag2` (without any URL specified) will revert you app to the master branch. *This may break you wallabag* if it goes to a previous version (if the newest is not retrocompatible).
 ## Documentation and resources

-* Official app website: https://www.wallabag.org
-* Official admin documentation: https://doc.wallabag.org/en/
-* Upstream app code repository: https://github.com/wallabag/wallabag
-* YunoHost documentation for this app: https://yunohost.org/app_wallabag2
-* Report a bug: https://github.com/YunoHost-Apps/wallabag2_ynh/issues
+* Official app website: <https://www.wallabag.org>
+* Official admin documentation: <https://doc.wallabag.org/en/>
+* Upstream app code repository: <https://github.com/wallabag/wallabag>
+* YunoHost documentation for this app: <https://yunohost.org/app_wallabag2>
+* Report a bug: <https://github.com/YunoHost-Apps/wallabag2_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade wallabag2 -u https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Wallabag pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg)  
 [![Installer Wallabag avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer Wallabag rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -16,13 +20,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo).


-**Version incluse :** 2.3.8~ynh4
+**Version incluse :** 2.4.3~ynh1

 **Démo :** https://demo.yunohost.org/wallabag/

 ## Captures d'écran

-![](./doc/screenshots/screenshot1.webp)
+![Capture d'écran de Wallabag](./doc/screenshots/screenshot1.webp)

 ## Avertissements / informations importantes

@ -51,21 +55,22 @@ Attention : Une mise à jour classique avec l'interface d'administration ou avec

 ## Documentations et ressources

-* Site officiel de l'app : https://www.wallabag.org
-* Documentation officielle de l'admin : https://doc.wallabag.org/en/
-* Dépôt de code officiel de l'app : https://github.com/wallabag/wallabag
-* Documentation YunoHost pour cette app : https://yunohost.org/app_wallabag2
-* Signaler un bug : https://github.com/YunoHost-Apps/wallabag2_ynh/issues
+* Site officiel de l'app : <https://www.wallabag.org>
+* Documentation officielle de l'admin : <https://doc.wallabag.org/en/>
+* Dépôt de code officiel de l'app : <https://github.com/wallabag/wallabag>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_wallabag2>
+* Signaler un bug : <https://github.com/YunoHost-Apps/wallabag2_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade wallabag2 -u https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.8.tar.gz
-SOURCE_SUM=58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb
+SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.4.3.tar.gz
+SOURCE_SUM=bba4df940cf1a1ac632e134cbf9b9af8d3c1bf89311b2720cf64179e1b431d3a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "A self hostable read-it-later app",
        "fr": "Une application de lecture-plus-tard auto-hébergeable"
    },
-    "version": "2.3.8~ynh4",
+    "version": "2.4.3~ynh1",
    "url": "https://www.wallabag.org",
    "upstream": {
        "license": "MIT",
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,8 +4,10 @@
 # COMMON VARIABLES
 #=================================================

+YNH_PHP_VERSION="7.4"
+
 # dependencies used by the app
-pkg_dependencies="php$YNH_DEFAULT_PHP_VERSION-cli php$YNH_DEFAULT_PHP_VERSION-mysql php$YNH_DEFAULT_PHP_VERSION-json php$YNH_DEFAULT_PHP_VERSION-gd php$YNH_DEFAULT_PHP_VERSION-tidy php$YNH_DEFAULT_PHP_VERSION-curl php$YNH_DEFAULT_PHP_VERSION-php-gettext php$YNH_DEFAULT_PHP_VERSION-redis"
+pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-xml"

 #=================================================
 # PERSONAL HELPERS
--- a/scripts/change_url
+++ b/scripts/change_url
@ -104,13 +104,13 @@ fi
 ynh_script_progression --message="Updating wallabag configuration..."

 # Configure Wallabag instance URL
-ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'"
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE internal_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'"

 # Change domain name in parameters.yml
 ynh_replace_string --match_string="domain_name: .*" --replace_string="domain_name: https://$new_domain$new_path" --target_file=$final_path/app/config/parameters.yml

 # If "Download images locally" option has been enabled in Internal Settings
-download_images_enabled=$(ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "SELECT value from craue_config_setting WHERE name='download_images_enabled '" | tail -n 1)
+download_images_enabled=$(ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "SELECT value from internal_setting WHERE name='download_images_enabled '" | tail -n 1)
 if [ "$download_images_enabled" = "1" ]
 then
  ynh_print_info --message="Updating images URL; this operation may take a while..."
--- a/scripts/install
+++ b/scripts/install
@ -96,7 +96,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2

 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION

 #=================================================
 # SPECIFIC SETUP
@ -121,7 +121,7 @@ ynh_replace_string --match_string="secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" --rep
 ynh_replace_string --match_string="domain_name: https://your-wallabag-url-instance.com" --replace_string="domain_name: https://$domain$path_url" --target_file=$wb_conf

 # Alias for php-cli execution command
-php_exec="ynh_exec_as $app php "$final_path/bin/console" --no-interaction --env=prod"
+php_exec="ynh_exec_as $app php$YNH_PHP_VERSION "$final_path/bin/console" --no-interaction --env=prod"

 # Set permissions to app files
 chown -R $app: $final_path
@ -141,7 +141,7 @@ done
 $php_exec fos:user:promote --super "$admin"

 # Configure Wallabag instance URL
-ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'"
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE internal_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'"

 #=================================================
 # SETUP HOOKS
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -123,7 +123,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."

 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION

 # Set-up fail2ban
 # Create the log file is not already existing
@ -164,7 +164,7 @@ then
 	#=================================================

 	# Alias for php-cli execution command
-	php_exec="ynh_exec_as $app php "$final_path/bin/console" --no-interaction --env=prod"
+	php_exec="ynh_exec_as $app php${YNH_PHP_VERSION} "$final_path/bin/console" --no-interaction --env=prod"

 	# Set permissions to app files
 	chown -R $app: $final_path
@ -174,7 +174,7 @@ then
 	$php_exec cache:clear

 	# Configure Wallabag instance URL
-	ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'"
+	ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE internal_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'"
 fi

 #=================================================