From e9009830fb5ee25dfc2737d7d67628e2dc32670d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 25 Aug 2022 13:52:23 +0200 Subject: [PATCH] Testing (#28) * upgrade to 0.8.16 * Fix * Add scripts * Fix * Update install * Fix * Fix * fix * Update nginx.conf * permissions * fix * Update nginx.conf * fix * rework nginx conf * fix * Add extensions * Update nginx.conf * Update manifest.json * Update change_url * Small fixes * Update manifest.json * Update manifest.json * remove plugins * Update README.md * Use SVG badge * Fix * Update upgrade * Update install * Update manifest.json * Update manifest.json * Upgrade to 0.8.17 * Update app.src * Update app.src * Update app.src * Fix * Fix badges * Fix * [autopatch] Update issue and PR templates (#12) Co-authored-by: Yunohost-Bot <> * Add templates * Cleaning up (#13) * Update app.src * New version (#15) * new version * Auto-update README * Fix Co-authored-by: Yunohost-Bot <> * Update restore * Create updater.yml * Create upgrade.sh * Update upgrade.sh * Fix * Update updater.sh * Fix * Update updater.sh * Update manifest.json * Auto-update README * 0.8.18 (#19) * 0.8.18 * 4.3 (#21) * 4.3 * 0.8.20 (#23) * 0.8.20 * Auto-update README * Update check_process Co-authored-by: yunohost-bot * Upgrade to upstream * Auto-update README * Bullseye (#27) * Auto-update README * Fix upgrade content * Auto-update README * Update upgrade Co-authored-by: yunohost-bot * Auto-update README * Update manifest.json Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot --- README.md | 3 ++- README_fr.md | 3 ++- conf/app.src | 4 ++-- manifest.json | 6 +++--- scripts/restore | 16 +++++++++------- scripts/upgrade | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 860759b..81cfb2c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Système de gestion de contenu (CMS) for simple website -**Shipped version:** 0.8.20~ynh2 +**Shipped version:** 0.8.20~ynh3 + **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index ddf0507..5f9dc78 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Content management system (CMS) pour un site simple -**Version incluse :** 0.8.20~ynh2 +**Version incluse :** 0.8.20~ynh3 + **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/conf/app.src b/conf/app.src index edf536e..4f63db3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/datenstrom/yellow/archive/b19d2f92e3453ca4d0c283c92b4a22066ce40b63.zip -SOURCE_SUM=ddd9c56f35fbbfe7e5e70ec94172ec7459aca8d624b1794c872705091743192d +SOURCE_URL=https://github.com/datenstrom/yellow/archive/f9f60b8a949ad0820e032f84fde3faf873e0b2c6.zip +SOURCE_SUM=a6eaa696ecc9cc9c8ca7b6584ee49e586e268d5c324822e05502ea2f4b6a9576 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 10a14c2..02706ab 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Système de gestion de contenu (CMS) for simple website", "fr": "Content management system (CMS) pour un site simple" }, - "version": "0.8.20~ynh2", + "version": "0.8.20~ynh3", "url": "https://datenstrom.se/yellow/", "upstream": { "license": "GPL-2.0-only", @@ -20,7 +20,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">> 4.3.0" + "yunohost": ">> 11.0.9" }, "multi_instance": true, "services": [ @@ -36,7 +36,7 @@ { "name": "path", "type": "path", - "example": "/example", + "example": "/yellow", "default": "/yellow" }, { diff --git a/scripts/restore b/scripts/restore index a406e83..02d8c0d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,16 +33,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -77,6 +72,13 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e1c0b5c..41b8db2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,7 +76,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="content media" fi chmod 750 "$final_path"