From c1ed7709d675ff5e6053f026f31e410711bb7ca6 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:16:25 +0100 Subject: [PATCH 01/13] Update to current version 0.9.4.2 --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index e934838..f17bb80 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://download.tuxfamily.org/galette/galette-0.9.2.1.tar.bz2 -SOURCE_SUM=d1fb7b75d045574d7fdff6416c1ac543ef3d30280e086fc970e141f4e051281a +SOURCE_URL=https://github.com/galette/galette/archive/0.9.4.2.tar.gz +SOURCE_SUM=20cc417a5870a26b2d18b18940183156906c51989d3a563282b4b58f25d016a2 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.bz2 +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= From 653c0f44d15caaeb1353c68ad5a830bfb67f2509 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:25:48 +0100 Subject: [PATCH 02/13] upgrade to 0.9.2.1 --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e57844c..f160f84 100644 --- a/manifest.json +++ b/manifest.json @@ -4,13 +4,13 @@ "packaging_format": 1, "url": "https://www.galette.eu", "license": "GPL-3.0-or-later", - "version": "0.9.2.1~ynh1", + "version": "0.9.4.2~ynh1", "requirements": { "yunohost": ">= 3.6" }, "services": [ "nginx", - "php5-fpm", + "php7-fpm", "mysql" ], "description": { From 6a1e5aba3a03fc7c80daed19ca669bad3dfc6a00 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:31:02 +0100 Subject: [PATCH 03/13] update php7.1-curl to 7.3 --- scripts/_common.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b67f970..afebd92 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,8 @@ #================================================= # dependencies used by the app -php_version="7.1" -php_packages="php7.1-tidy php7.1-intl php7.1-mbstring php7.1-mysql php7.1-xml php7.1-gd php7.1-curl" +php_version="7.3" +php_packages="php7.3-tidy php7.3-intl php7.3-mbstring php7.3-mysql php7.3-xml php7.3-gd php7.3-curl" #================================================= # EXPERIMENTAL HELPERS @@ -79,9 +79,9 @@ ynh_install_php () { # Store php_version into the config of this app ynh_app_setting_set $app php_version $phpversion - if [ "$phpversion" == "7.0" ] + if [ "$phpversion" == "7.3" ] then - ynh_die "Do not use ynh_install_php to install php7.0" + ynh_die "Do not use ynh_install_php to install php7.3" fi # Store the ID of this app and the version of php requested for it @@ -96,7 +96,7 @@ ynh_install_php () { ynh_add_app_dependencies --package="php$phpversion php${phpversion}-common $package" # Set php7.0 back as the default version for php-cli. - update-alternatives --set php /usr/bin/php7.0 + update-alternatives --set php /usr/bin/php7.3 # Remove this extra repository after packages are installed ynh_remove_extra_repo --name=extra_php_version @@ -109,11 +109,11 @@ ynh_remove_php () { # Get the version of php used by this app local phpversion=$(ynh_app_setting_get $app php_version) - if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ] + if [ "$phpversion" == "7.3" ] || [ -z "$phpversion" ] then - if [ "$phpversion" == "7.0" ] + if [ "$phpversion" == "7.3" ] then - ynh_print_err "Do not use ynh_remove_php to install php7.0" + ynh_print_err "Do not use ynh_remove_php to install php7.3" fi return 0 fi From 21d077e5b9ccfdf6c6b5da166696636f7fe93664 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:34:12 +0100 Subject: [PATCH 04/13] use php 7.3 --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 8a0cb41..a575c56 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,5 +109,5 @@ ynh_restore_file "/etc/logrotate.d/$app" # RELOAD NGINX AND PHP-FPM #================================================= -systemctl reload php7.1-fpm +systemctl reload php7.3-fpm systemctl reload nginx From d8935f9831b42b6cabd8c655fd8093eeacd4c416 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:35:12 +0100 Subject: [PATCH 05/13] use php 7.3 --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 14ad113..daae417 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -16,7 +16,7 @@ location __PATH__/ { try_files $uri $uri/ @galette; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php7.1-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php7.3-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; From 58fff97a6953d250f042d64ec3ab8156a53624d9 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:36:20 +0100 Subject: [PATCH 06/13] use php 7.3 --- conf/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 98cb11a..f22090f 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -30,7 +30,7 @@ group = __USER__ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php7.1-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php7.3-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -355,7 +355,7 @@ catch_workers_output = yes ; exectute php code. ; Note: set an empty value to allow all extensions. ; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 +;security.limit_extensions = .php .php3 .php4 .php5 .php7 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. From 24189672d546dbbd46f2472403c856277d51b381 Mon Sep 17 00:00:00 2001 From: pp-r <64266134+pp-r@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:38:07 +0100 Subject: [PATCH 07/13] upgrade to 0.9.4.2 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f160f84..cf5c8b6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "license": "GPL-3.0-or-later", "version": "0.9.4.2~ynh1", "requirements": { - "yunohost": ">= 3.6" + "yunohost": ">= 3.8" }, "services": [ "nginx", From 66aa7a24b344ef47141a42ba3672c4851541949a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:56:26 +0100 Subject: [PATCH 08/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cf5c8b6..55d7385 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "license": "GPL-3.0-or-later", "version": "0.9.4.2~ynh1", "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 3.8.1" }, "services": [ "nginx", From ad388095e3d1f28a5d89bb3de4aca347335a3918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:56:33 +0100 Subject: [PATCH 09/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 55d7385..73a2b49 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ }, "services": [ "nginx", - "php7-fpm", + "php7.3-fpm", "mysql" ], "description": { From a25d964fbed6e7b081a1286606f77c9efb53c3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 21:56:47 +0100 Subject: [PATCH 10/13] Update scripts/_common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index afebd92..303e5b9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,8 @@ #================================================= # dependencies used by the app -php_version="7.3" -php_packages="php7.3-tidy php7.3-intl php7.3-mbstring php7.3-mysql php7.3-xml php7.3-gd php7.3-curl" +YNH_PHP_VERSION="7.3" +php_packages="php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl" #================================================= # EXPERIMENTAL HELPERS From e6b63cbb6d122cfed3fa36725b2208285dc29bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 23:08:14 +0100 Subject: [PATCH 11/13] Update conf/nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index daae417..2a9323a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -16,7 +16,7 @@ location __PATH__/ { try_files $uri $uri/ @galette; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php7.3-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; From 63d78fe329ed1ab8f851598f6af8d995ced393a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 23:08:23 +0100 Subject: [PATCH 12/13] Update conf/php-fpm.conf --- conf/php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index f22090f..8411990 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -30,7 +30,7 @@ group = __USER__ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php7.3-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) From dbe897dba28264ef562d814b35bf703172745ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jan 2021 23:08:31 +0100 Subject: [PATCH 13/13] Update scripts/restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index a575c56..51b0b91 100644 --- a/scripts/restore +++ b/scripts/restore @@ -109,5 +109,5 @@ ynh_restore_file "/etc/logrotate.d/$app" # RELOAD NGINX AND PHP-FPM #================================================= -systemctl reload php7.3-fpm +systemctl reload php$phpversion-fpm systemctl reload nginx