From 1484d8a7739f7b03178487cab550108c1eb6db69 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 21 May 2022 08:59:22 +0200 Subject: [PATCH 1/3] php8 --- manifest.json | 2 +- scripts/_common.sh | 3 ++- scripts/restore | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index 8ff4c3c..082ebe0 100755 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.4-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index f727bb8..5d4be2c 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,10 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" pkg_dependencies="php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-zip" + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/restore b/scripts/restore index 13b144f..284da64 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,13 +74,6 @@ chmod -R g+w $final_path/media/files/ chmod -R g+w $final_path/media/images/ chmod -R g+w $final_path/translations/ -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # REINSTALL DEPENDENCIES #================================================= @@ -89,6 +82,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="Restoring the PHP-FPM configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= From 8b94737db73711f1263eeb653aba35e978a225ee Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 22 May 2022 08:02:19 +0200 Subject: [PATCH 2/3] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 082ebe0..50e08d7 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Marketing Automation Software", "fr": "Logiciel d'automatisation marketing open source" }, - "version": "4.2.2~ynh1", + "version": "4.2.2~ynh2", "url": "https://www.mautic.org/", "upstream": { "license": "GPL-3.0-only", From 2f3539837ae52d9f41d5a0ab39372932389ccb66 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 22 May 2022 06:02:23 +0000 Subject: [PATCH 3/3] 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 ee8ba30..d2574d5 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open Source Marketing Automation Software -**Shipped version:** 4.2.2~ynh1 +**Shipped version:** 4.2.2~ynh2 **Demo:** https://www.mautic.org/demo diff --git a/README_fr.md b/README_fr.md index eb69a56..1488cf6 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 Logiciel d'automatisation marketing open source -**Version incluse :** 4.2.2~ynh1 +**Version incluse :** 4.2.2~ynh2 **Démo :** https://www.mautic.org/demo