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= diff --git a/conf/nginx.conf b/conf/nginx.conf index 14ad113..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.1-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 98cb11a..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.1-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) @@ -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. diff --git a/manifest.json b/manifest.json index e57844c..73a2b49 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" + "yunohost": ">= 3.8.1" }, "services": [ "nginx", - "php5-fpm", + "php7.3-fpm", "mysql" ], "description": { diff --git a/scripts/_common.sh b/scripts/_common.sh index b67f970..303e5b9 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" +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 @@ -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 diff --git a/scripts/restore b/scripts/restore index 8a0cb41..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.1-fpm +systemctl reload php$phpversion-fpm systemctl reload nginx