Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 559116 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +15 lines)
Line  Link Here
0
-- a/sapi/fpm/php-fpm.conf.in
0
++ b/sapi/fpm/php-fpm.conf.in
Lines 12-18 Link Here
12
; Relative path can also be used. They will be prefixed by:
12
; Relative path can also be used. They will be prefixed by:
13
;  - the global prefix if it's been set (-p argument)
13
;  - the global prefix if it's been set (-p argument)
14
;  - @prefix@ otherwise
14
;  - @prefix@ otherwise
15
;include=etc/fpm.d/*.conf
15
;include = /etc/php/fpm-php@SLOT@/fpm.d/*.conf
16
16
17
;;;;;;;;;;;;;;;;;;
17
;;;;;;;;;;;;;;;;;;
18
; Global Options ;
18
; Global Options ;
Lines 22-27 Link Here
22
; Pid file
22
; Pid file
23
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
23
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
24
; Default Value: none
24
; Default Value: none
25
; Warning: pid file is overriden by the Gentoo init script.
26
; FPM will refuse to start if you uncomment this settingi and make use of the
27
; init script.
25
;pid = run/php-fpm.pid
28
;pid = run/php-fpm.pid
26
29
27
; Error log file
30
; Error log file
Lines 29-35 Link Here
29
; in a local file.
32
; in a local file.
30
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
33
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
31
; Default Value: log/php-fpm.log
34
; Default Value: log/php-fpm.log
32
;error_log = log/php-fpm.log
35
error_log = /var/log/php-fpm.log
33
36
34
; syslog_facility is used to specify what type of program is logging the
37
; syslog_facility is used to specify what type of program is logging the
35
; message. This lets syslogd specify that messages from different facilities
38
; message. This lets syslogd specify that messages from different facilities
Lines 378-384 Link Here
378
381
379
; The access log file
382
; The access log file
380
; Default: not set
383
; Default: not set
381
;access.log = log/$pool.access.log
384
;access.log = /var/log/php-fpm-$pool.access.log
382
385
383
; The access log format.
386
; The access log format.
384
; The following syntax is allowed
387
; The following syntax is allowed
Lines 438-444 Link Here
438
; The log file for slow requests
441
; The log file for slow requests
439
; Default Value: not set
442
; Default Value: not set
440
; Note: slowlog is mandatory if request_slowlog_timeout is set
443
; Note: slowlog is mandatory if request_slowlog_timeout is set
441
;slowlog = log/$pool.log.slow
444
;slowlog = /var/log/php-fpm-$pool.log.slow
442
 
445
 
443
; The timeout for serving a single request after which a PHP backtrace will be
446
; The timeout for serving a single request after which a PHP backtrace will be
444
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
447
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
Lines 535-537 Link Here
535
;php_admin_value[error_log] = /var/log/fpm-php.www.log
538
;php_admin_value[error_log] = /var/log/fpm-php.www.log
536
;php_admin_flag[log_errors] = on
539
;php_admin_flag[log_errors] = on
537
;php_admin_value[memory_limit] = 32M
540
;php_admin_value[memory_limit] = 32M
541
542
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
543
; Include Additional Configurations ;
544
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
545
546
; Now include additional config files
547
include = /etc/php/fpm-php@SLOT@/fpm.d/*.conf

Return to bug 559116