--- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - @prefix@ otherwise -;include=etc/fpm.d/*.conf +;include = /etc/php/fpm-php@SLOT@/fpm.d/*.conf ;;;;;;;;;;;;;;;;;; ; Global Options ; @@ -22,6 +22,9 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none +; Warning: pid file is overriden by the Gentoo init script. +; FPM will refuse to start if you uncomment this settingi and make use of the +; init script. ;pid = run/php-fpm.pid ; Error log file @@ -29,7 +32,7 @@ ; in a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log +error_log = /var/log/php-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 @@ -378,7 +381,7 @@ ; The access log file ; Default: not set -;access.log = log/$pool.access.log +;access.log = /var/log/php-fpm-$pool.access.log ; The access log format. ; The following syntax is allowed @@ -438,7 +441,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 = /var/log/php-fpm-$pool.log.slow ; 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'. @@ -535,3 +538,10 @@ ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Include Additional Configurations ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; Now include additional config files +include = /etc/php/fpm-php@SLOT@/fpm.d/*.conf