From: Debian PHP Maintainers Date: Sat, 2 May 2015 08:26:54 +0000 (+0200) Subject: fpm-config X-Git-Tag: archive/raspbian/8.4.11-1+rpi1^2~35 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=002f6ee67437e23537a1296e8181a07dfda2b954;p=php8.4.git fpm-config Gbp-Pq: Name 0012-fpm-config.patch --- diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index 4818f20b..49977482 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -14,14 +14,16 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid +; Warning: if you change the value here, you need to modify systemd +; service PIDFile= setting to match the value here. +pid = @EXPANDED_LOCALSTATEDIR@/run/php/php@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written ; into a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log +error_log = @EXPANDED_LOCALSTATEDIR@/log/php@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@-fpm.log ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities @@ -140,4 +142,4 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - @prefix@ otherwise -include=@php_fpm_sysconfdir@/php-fpm.d/*.conf +include=@php_fpm_sysconfdir@/pool.d/*.conf