From 7a75fed7b6339c015e3e7d35806cfb298b965a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 14 May 2022 11:08:11 +0200 Subject: [PATCH] Testing (#24) * 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 Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- check_process | 5 +++-- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/restore | 14 +++++++------- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index fc43de2..af5e64c 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 Système de gestion de contenu (CMS) for simple website -**Shipped version:** 0.8.18~ynh1 +**Shipped version:** 0.8.20~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 81d626e..4077587 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 Content management system (CMS) pour un site simple -**Version incluse :** 0.8.18~ynh1 +**Version incluse :** 0.8.20~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/check_process b/check_process index 79ae4c3..3a3ae8d 100644 --- a/check_process +++ b/check_process @@ -11,6 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=fb406ca10bf4af1d44b5fcecc4d6e54aee335fce backup_restore=1 multi_instance=1 change_url=1 @@ -18,6 +19,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. + ; commit=fb406ca10bf4af1d44b5fcecc4d6e54aee335fce + name=Testing (#22) manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/app.src b/conf/app.src index a09a838..56a42c3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/datenstrom/yellow/archive/bceeeba72ba628332c345d52556fb16980f47c65.zip -SOURCE_SUM=27f94851517fe3334ac254d76e80b4120c45af1b88944d0f136d7cfc0ba751dc +SOURCE_URL=https://github.com/datenstrom/yellow/archive/51e9fc035eef8c16cb8e3181b975c4cc8db08152.zip +SOURCE_SUM=a0edd2be49b6ddaa7f1c5081fdd8841e301fbb33fb0c472ba4d2ca33c2e20c99 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 521c961..c70f828 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.18~ynh1", + "version": "0.8.20~ynh1", "url": "https://datenstrom.se/yellow/", "upstream": { "license": "GPL-2.0-only", @@ -25,7 +25,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm" + "php8.0-fpm" ], "arguments": { "install" : [ diff --git a/scripts/_common.sh b/scripts/_common.sh index df3f8c9..f01d5fb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip" diff --git a/scripts/restore b/scripts/restore index 6a93576..a406e83 100644 --- a/scripts/restore +++ b/scripts/restore @@ -62,13 +62,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # REINSTALL DEPENDENCIES #================================================= @@ -77,6 +70,13 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + #================================================= # GENERIC FINALIZATION #=================================================