From d02dbf908e4051076054574a23f70e4a9ebe4cf8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:06:49 +0200 Subject: [PATCH 1/5] Fix --- conf/app.src | 1 - manifest.json | 10 ++++------ scripts/backup | 3 --- scripts/install | 3 --- scripts/restore | 2 -- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4b97a50..7a9849a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,3 @@ SOURCE_SUM=dacc6ae22fc8a6183b47e7e0ddc7d0a0a75b6c7203efc2194fd3af32c65a734f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index a73bd5c..c5bdfa9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "Fluxbb", + "name": "FluxBB", "id": "fluxbb", "packaging_format": 1, "description": { @@ -34,19 +34,17 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", "type": "path", - "example": "/forum", + "example": "/fluxbb", "default": "/fluxbb" }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", diff --git a/scripts/backup b/scripts/backup index 48e724c..d4d3c37 100755 --- a/scripts/backup +++ b/scripts/backup @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index 99d67fb..edfd652 100755 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/restore b/scripts/restore index 170e791..7186823 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,8 +39,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available $domain $path_url \ - || ynh_die "Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die "There is already a directory: $final_path " From 9fbe238535df4c31b5186a75f8c40ea3101d1a72 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 23 Sep 2021 21:06:55 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 6 +++--- README_fr.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index da82b5d..72733ee 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Fluxbb for YunoHost +# FluxBB for YunoHost [![Integration level](https://dash.yunohost.org/integration/fluxbb.svg)](https://dash.yunohost.org/appci/app/fluxbb) ![](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg) -[![Install Fluxbb with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) +[![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Fluxbb quickly and simply on a YunoHost server. +> *This package allows you to install FluxBB quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview diff --git a/README_fr.md b/README_fr.md index b8f0f9b..02100c3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,12 +1,12 @@ -# Fluxbb pour YunoHost +# FluxBB pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/fluxbb.svg)](https://dash.yunohost.org/appci/app/fluxbb) ![](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg) -[![Installer Fluxbb avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) +[![Installer FluxBB avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluxbb) *[Read this readme in english.](./README.md)* *[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Fluxbb rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer FluxBB 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.* ## Vue d'ensemble From 404679729d0ef84cba6c6c5ef7315ba4db950a4d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:12:56 +0200 Subject: [PATCH 3/5] Remove service --- scripts/change_url | 3 ++- scripts/install | 6 ------ scripts/remove | 13 ------------- scripts/restore | 9 --------- scripts/upgrade | 6 ------ 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index c75b773..f972dd0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -27,7 +27,8 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get $app final_path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index edfd652..5fbf042 100755 --- a/scripts/install +++ b/scripts/install @@ -115,12 +115,6 @@ ynh_secure_remove "$final_path/install.php" ynh_permission_update --permission="main" --remove="visitors" -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -yunohost service add $app --description="Fast, light, user-friendly forum software" --log="/var/log/$app/$app.log" - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 5e81f03..ad45b30 100755 --- a/scripts/remove +++ b/scripts/remove @@ -21,19 +21,6 @@ db_name=$(ynh_app_setting_get $app db_name) db_user=$db_name final_path=$(ynh_app_setting_get $app final_path) -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE SERVICE FROM ADMIN PANEL -#================================================= - -# Remove a service from the admin panel, added by `yunohost service add` -if ynh_exec_warn_less yunohost service status $app >/dev/null -then - ynh_script_progression --message="Removing $app service integration..." - yunohost service remove $app -fi - #================================================= # REMOVE THE MYSQL DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index 7186823..90e99b3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -84,12 +81,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -yunohost service add $app --description="Fast, light, user-friendly forum software" --log="/var/log/$app/$app.log" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4d8372f..75d4351 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,12 +114,6 @@ ynh_script_progression --message="Removing install.php" --weight=1 ynh_secure_remove "$final_path/install.php" -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -yunohost service add $app --description="Fast, light, user-friendly forum software" --log="/var/log/$app/$app.log" - #================================================= # RELOAD NGINX #================================================= From 245e0d6002c739578d8076133c16f4f367bcdf00 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Sep 2021 07:36:03 +0200 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c5bdfa9..a6cc7ef 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fast, light, user-friendly forum software", "fr": "Forum de discussions rapide et léger" }, - "version": "1.5.11~ynh3", + "version": "1.5.11~ynh4", "url": "https://fluxbb.org/", "upstream": { "license": "GPL-2.0-only", From 5ad1f5f711169837e3b22ad550ec1431b2e45140 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 24 Sep 2021 05:36:07 +0000 Subject: [PATCH 5/5] 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 72733ee..e973afd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Shipped version:** 1.5.11~ynh3 +**Shipped version:** 1.5.11~ynh4 **Demo:** https://fluxbb.org/forums/index.php diff --git a/README_fr.md b/README_fr.md index 02100c3..d3e99ef 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Version incluse :** 1.5.11~ynh3 +**Version incluse :** 1.5.11~ynh4 **Démo :** https://fluxbb.org/forums/index.php