From 95df3db6aa3f7ce650a33160bde973bcfe5ad56c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:50:50 +0200 Subject: [PATCH] Testing (#216) * Fix hook (#206) * Auto-update READMEs * fix hook --------- Co-authored-by: yunohost-bot * Update manifest.toml (#208) * Update manifest.toml * Auto-update READMEs * Add parameters.yml (#209) * Add parameters.yml * Update upgrade * Update change_url * Function (#210) * Add parameters.yml * Update upgrade * add function * fix: add time for php script to run a 'long sync' with an application (#213) * Auto-update READMEs * [autopatch] Automatic patch attempt for helpers 2.1 (#214) * Testing (#207) * Fix hook (#206) * Auto-update READMEs * fix hook --------- Co-authored-by: yunohost-bot * Update manifest.toml (#208) * Update manifest.toml * Auto-update READMEs * Add parameters.yml (#209) * Add parameters.yml * Update upgrade * Update change_url * Function (#210) * Add parameters.yml * Update upgrade * add function --------- Co-authored-by: Kayou Co-authored-by: yunohost-bot * Auto-update READMEs * [autopatch] Automatic patch attempt for helpers 2.1 * cleaning --------- Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Kayou Co-authored-by: Yunohost-Bot <> * Auto-update READMEs * Update manifest.toml * Auto-update READMEs * fix * Auto-update READMEs * Update manifest.toml * Update manifest.toml * Auto-update READMEs * cleaning --------- Co-authored-by: Kayou Co-authored-by: yunohost-bot Co-authored-by: Gofannon <17145502+Gofannon@users.noreply.github.com> Co-authored-by: YunoHost Bot --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 5 ++--- scripts/backup | 1 - scripts/install | 3 --- scripts/remove | 4 ---- scripts/restore | 1 - scripts/upgrade | 4 ---- 15 files changed, 11 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 4c7d342..32f0cd0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Shipped version:** 2.5.4~ynh5 +**Shipped version:** 2.5.4~ynh6 **Demo:** diff --git a/README_es.md b/README_es.md index ec234a3..eda8163 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión actual:** 2.5.4~ynh5 +**Versión actual:** 2.5.4~ynh6 **Demo:** diff --git a/README_eu.md b/README_eu.md index 9030b54..28471b8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Paketatutako bertsioa:** 2.5.4~ynh5 +**Paketatutako bertsioa:** 2.5.4~ynh6 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 222a450..59d7fd4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Sont disponibles une interface web, des add-ons pour navigateurs (Firefox/Chrome La mise à niveau depuis le paquet YunoHost de [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) demande une opération manuelle, c'est pourquoi un nouveau paquet est fournit. Pour le processus de migration, merci de vous référer à [la documentation officiel de Wallabag](https://doc.wallabag.org/fr/user/import/wallabagv1.html). -**Version incluse :** 2.5.4~ynh5 +**Version incluse :** 2.5.4~ynh6 **Démo :** diff --git a/README_gl.md b/README_gl.md index b1b622e..6096d3f 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión proporcionada:** 2.5.4~ynh5 +**Versión proporcionada:** 2.5.4~ynh6 **Demo:** diff --git a/README_id.md b/README_id.md index a48b36e..385788e 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versi terkirim:** 2.5.4~ynh5 +**Versi terkirim:** 2.5.4~ynh6 **Demo:** diff --git a/README_nl.md b/README_nl.md index 5edede1..4b2dfc1 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Geleverde versie:** 2.5.4~ynh5 +**Geleverde versie:** 2.5.4~ynh6 **Demo:** diff --git a/README_ru.md b/README_ru.md index 4bca681..1c3d15a 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Поставляемая версия:** 2.5.4~ynh5 +**Поставляемая версия:** 2.5.4~ynh6 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a878cee..c42d58e 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**分发版本：** 2.5.4~ynh5 +**分发版本：** 2.5.4~ynh6 **演示：** diff --git a/manifest.toml b/manifest.toml index 0f7cb35..f9b062c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,8 +6,7 @@ id = "wallabag2" name = "Wallabag" description.en = "Save and classify articles. Read them later" description.fr = "Enregistrez et classez les articles. Lisez-les plus tard" - -version = "2.5.4~ynh5" +version = "2.5.4~ynh6" maintainers = ["lapineige"] @@ -21,7 +20,7 @@ cpe = "cpe:2.3:a:wallabag:wallabag" fund = "https://liberapay.com/wallabag" [integration] -yunohost = ">= 11.2.29" +yunohost = ">= 11.2.30" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/backup b/scripts/backup index 641e844..0e57a25 100644 --- a/scripts/backup +++ b/scripts/backup @@ -4,7 +4,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/install b/scripts/install index 552c47c..47cabf9 100644 --- a/scripts/install +++ b/scripts/install @@ -69,13 +69,10 @@ ynh_replace --match="__APP__" --replace="$app" --file="../hooks/post_user_delete #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Use logrotate to manage application logfile(s) ynh_config_add_logrotate "$install_dir/var/logs/prod.log" # Create a dedicated Fail2Ban config diff --git a/scripts/remove b/scripts/remove index ec528f5..1cc3851 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,16 +12,12 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the app-specific logrotate config ynh_config_remove_logrotate -# Remove the dedicated NGINX config ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config ynh_config_remove_phpfpm -# Remove the dedicated Fail2Ban config ynh_config_remove_fail2ban #================================================= diff --git a/scripts/restore b/scripts/restore index 5e73e7b..b4b5d07 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,7 +4,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/upgrade b/scripts/upgrade index b251691..1555c17 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace --keep="app/config/parameters.yml var/logs web/assets/images" # Create log dir/file is it useless? @@ -49,15 +48,12 @@ ynh_replace --match="__APP__" --replace="$app" --file="../hooks/post_user_delete #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm ynh_config_add_logrotate "$install_dir/var/logs/prod.log" -# Add fail2ban config ynh_config_add_fail2ban --logpath="$install_dir/var/logs/prod.log" --failregex='app.ERROR: Authentication failure for user "([\w]+)?", from IP ""' # same as install config #=================================================