Skip to content

Commit

Permalink
Merge branch 'ameir-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
yevgenko committed Apr 16, 2013
2 parents 28afb41 + da3bb1b commit ece7137
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions templates/default/pool.conf.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; Start a new pool named 'www'.
; Start a new pool named '<%= @pool_name %>'.
[<%= @pool_name %>]

# <%= [@params].flatten.join " " %>
Expand Down Expand Up @@ -156,7 +156,7 @@ pm.max_spare_servers = <%= @max_spare_servers %>
; The log file for slow requests
; Default Value: not set
; Note: slowlog is mandatory if request_slowlog_timeout is set
slowlog = /var/log/php-fpm/www-slow.log
;slowlog = /var/log/php-fpm/www-slow.log

; Set open file descriptor rlimit.
; Default Value: system defined value
Expand Down Expand Up @@ -219,11 +219,11 @@ slowlog = /var/log/php-fpm/www-slow.log
; specified at startup with the -d argument
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [email protected]
;php_flag[display_errors] = off
php_admin_value[error_log] = /var/log/php-fpm/www-error.log
php_admin_flag[log_errors] = on
;php_admin_value[error_log] = /var/log/php-fpm/www-error.log
;php_admin_flag[log_errors] = on
;php_admin_value[memory_limit] = 128M

; Set session path to a directory owned by process user
php_value[session.save_handler] = files
php_value[session.save_path] = /var/lib/php/session
;php_value[session.save_handler] = files
;php_value[session.save_path] = /var/lib/php/session

0 comments on commit ece7137

Please sign in to comment.