From 4a04fc7157f54d16285c260fcdc7e88fbc3cc3a6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 23 Dec 2020 23:04:30 +0100 Subject: [PATCH 1/2] Fix linter warnings --- conf/php-fpm.conf | 2 +- scripts/upgrade | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 298a1b7..47b65bf 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -195,7 +195,7 @@ pm.max_requests = 500 ; start time - the date and time the process has started; ; start since - the number of seconds since the process has started; ; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; +; request duration - the duration in s of the requests; ; request method - the request method (GET, POST, ...); ; request URI - the request URI with the query string; ; content length - the content length of the request (only with POST); diff --git a/scripts/upgrade b/scripts/upgrade index 47c5bfc..a4eceed 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,13 +113,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= From 7ace96baaa16dc292cf8780d3fd552daba99869b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 25 Dec 2020 19:36:30 +0100 Subject: [PATCH 2/2] Do not use www-data as PHP-FPM group --- 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 47b65bf..3803ae6 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -21,7 +21,7 @@ ; Note: The user is mandatory. If the group is not set, the default user's group ; will be used. user = __USER__ -group = www-data +group = __USER__ ; The address on which to accept FastCGI requests. ; Valid syntaxes are: @@ -45,7 +45,7 @@ listen = /var/run/php-fpm-__USER__.sock ; Default Values: user and group are set as the running user ; mode is set to 0660 listen.owner = __USER__ -listen.group = www-data +listen.group = __USER__ listen.mode = 0660 ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names.