diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
| commit | 96455275ddb5a2feed979afd277419d108c836b1 (patch) | |
| tree | fe5eaed7fad8d19c8a588cc375ce3b52fbb96df4 /user/php7/fpm-paths.patch | |
| parent | 6021da9d6a1217b3d891e48a424732f3f7fcd46c (diff) | |
| parent | 8be79780a4d67231c74bfe1f57648a16aea85687 (diff) | |
| download | packages-96455275ddb5a2feed979afd277419d108c836b1.tar.gz packages-96455275ddb5a2feed979afd277419d108c836b1.tar.bz2 packages-96455275ddb5a2feed979afd277419d108c836b1.tar.xz packages-96455275ddb5a2feed979afd277419d108c836b1.zip | |
Merge branch 'php7' into 'master'
user/{libzip,php7}: new packages
See merge request !38
Diffstat (limited to 'user/php7/fpm-paths.patch')
| -rw-r--r-- | user/php7/fpm-paths.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/user/php7/fpm-paths.patch b/user/php7/fpm-paths.patch new file mode 100644 index 000000000..56d40298b --- /dev/null +++ b/user/php7/fpm-paths.patch @@ -0,0 +1,58 @@ +--- a/sapi/fpm/fpm/fpm_conf.c ++++ b/sapi/fpm/fpm/fpm_conf.c +@@ -1205,7 +1205,7 @@ + } + + if (!fpm_global_config.error_log) { +- fpm_global_config.error_log = strdup("log/php-fpm.log"); ++ fpm_global_config.error_log = strdup("log/php/error.log"); + } + + #ifdef HAVE_SYSTEMD +@@ -1710,7 +1710,7 @@ + if (fpm_globals.prefix == NULL) { + spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); + } else { +- spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix); ++ spprintf(&tmp, 0, "%s/etc/php/php-fpm.conf", fpm_globals.prefix); + } + + if (!tmp) { + +--- a/sapi/fpm/php-fpm.conf.in ++++ b/sapi/fpm/php-fpm.conf.in +@@ -22,4 +22,4 @@ + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +-; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++; Default Value: log/php/error.log ++;error_log = log/php/error.log + +--- a/sapi/fpm/www.conf.in ++++ b/sapi/fpm/www.conf.in +@@ -256,7 +256,7 @@ + + ; The access log file + ; Default: not set +-;access.log = log/$pool.access.log ++;access.log = log/php/$pool.access.log + + ; The access log format. + ; The following syntax is allowed +@@ -320,7 +320,7 @@ + ; The log file for slow requests + ; Default Value: not set + ; Note: slowlog is mandatory if request_slowlog_timeout is set +-;slowlog = log/$pool.log.slow ++;slowlog = log/php/$pool.slow.log + + ; The timeout for serving a single request after which a PHP backtrace will be + ; dumped to the 'slowlog' file. A value of '0s' means 'off'. +@@ -418,6 +418,6 @@ + ; specified at startup with the -d argument + ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com + ;php_flag[display_errors] = off +-;php_admin_value[error_log] = /var/log/fpm-php.www.log ++;php_admin_value[error_log] = /var/log/php/$pool.error.log + ;php_admin_flag[log_errors] = on + ;php_admin_value[memory_limit] = 32M |