From 237879b38ee1a227e54d5e47adcc61f346de61dd Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 1 Sep 2023 08:20:49 +0200 Subject: [PATCH] Fix php conf & image permissions (#238) * Transfer to normal php conf * Transfer to normal php conf * Add running directory * Rename php_fpm.conf to php-fpm.conf * bump version * Auto-update README * bump minimum YNH version * switch back to extra_php * Set proper group owner for php Using new helper https://github.com/YunoHost/yunohost/commit/65d25710725b06d281630644b80d8d01dfba1bde * Set proper group owner for php * manifest: fix yunohost version requirement typo --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin --- conf/extra_php-fpm.conf | 3 --- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index c979f58d..f7960328 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -2,6 +2,3 @@ php_admin_value[upload_max_filesize] = 100M php_admin_value[post_max_size] = 100M - -; Group should not be pixelfed, unless image (folder) access rights are not working -group = www-data diff --git a/manifest.toml b/manifest.toml index ed354ec7..534438b0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2.4" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index 38a3213e..8519654c 100644 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data ynh_add_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index da9f593e..891ab379 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,7 +133,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data #================================================= # NGINX CONFIGURATION