From 33ec1b0ed6260cba50e0d9c9b78c26e08234bdde Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 29 Jun 2021 11:57:37 +0200 Subject: [PATCH 1/2] Remove service --- manifest.json | 2 +- scripts/install | 7 ------- scripts/remove | 13 ------------- scripts/restore | 7 ------- scripts/upgrade | 7 ------- 5 files changed, 1 insertion(+), 35 deletions(-) diff --git a/manifest.json b/manifest.json index 192106c..a31edb1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Forum software that is easy to use, powerful, and highly customisable", "fr": "Forum facile à utiliser, puissant et hautement personnalisable" }, - "version": "3.3.4~ynh2", + "version": "3.3.4~ynh3", "url": "http://www.phpbb.com/", "upstream": { "license": "GPL-2.0-only", diff --git a/scripts/install b/scripts/install index 2608e64..b94b85e 100644 --- a/scripts/install +++ b/scripts/install @@ -144,13 +144,6 @@ ynh_add_config --template="../conf/phpbb.cron" --destination="$cron_path" chown root: "$cron_path" chmod 644 "$cron_path" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 63b1d85..5eb5ecd 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,19 +22,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST -#================================================= - -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null -then - ynh_script_progression --message="Removing $app service integration..." --weight=1 - yunohost service remove $app -fi - #================================================= # REMOVE THE MYSQL DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index cbf519f..7a5d9aa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -91,13 +91,6 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ ynh_restore_file --origin_path="/etc/cron.d/$app" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d42f8ce..35bc1b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,13 +145,6 @@ ynh_add_config --template="../conf/phpbb.cron" --destination="$cron_path" chown root: "$cron_path" chmod 644 "$cron_path" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="Forum bulletin board software solution" --log="/var/log/$app/$app.log" - #================================================= # RELOAD NGINX #================================================= From 765b5cadc1bd900f59d1f74ba20884e2a7e8e9a4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 29 Jun 2021 09:57:45 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8768f2..d4d4992 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Forum software that is easy to use, powerful, and highly customisable -**Shipped version:** 3.3.4~ynh2 +**Shipped version:** 3.3.4~ynh3 **Demo:** https://www.phpbb.com/demo/ diff --git a/README_fr.md b/README_fr.md index 0fc9806..cfd84a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Forum facile à utiliser, puissant et hautement personnalisable -**Version incluse :** 3.3.4~ynh2 +**Version incluse :** 3.3.4~ynh3 **Démo :** https://www.phpbb.com/demo/