From 300a7e8a56615ee283e5326b11803f84404fd8f0 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 00:02:47 -0500 Subject: [PATCH 01/18] remove rbenv requirement --- .rbenv-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .rbenv-version diff --git a/.rbenv-version b/.rbenv-version deleted file mode 100644 index f3a9c9a..0000000 --- a/.rbenv-version +++ /dev/null @@ -1 +0,0 @@ -1.9.3-p194 From 0f0b292dadf95acd4045138333368bd0f0f6304c Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 00:16:30 -0500 Subject: [PATCH 02/18] allow custom www pool config --- attributes/default.rb | 8 + recipes/default.rb | 11 +- templates/default/www.conf.erb | 389 +++++++++++++++++++++++++++++++++ 3 files changed, 407 insertions(+), 1 deletion(-) create mode 100644 attributes/default.rb create mode 100644 templates/default/www.conf.erb diff --git a/attributes/default.rb b/attributes/default.rb new file mode 100644 index 0000000..e039d98 --- /dev/null +++ b/attributes/default.rb @@ -0,0 +1,8 @@ +default['php_fpm']['pm']['type'] = "dynamic" +default['php_fpm']['pm']['max_children'] = 10 +default['php_fpm']['pm']['start_servers'] = 4 +default['php_fpm']['pm']['min_spare_servers'] = 6 +default['php_fpm']['pm']['max_spare_servers'] = 12 +default['php_fpm']['pm']['process_idle_timeout'] = '10s' +default['php_fpm']['pm']['max_requests'] = 0 +default['php_fpm']['pm']['status_path'] = nil diff --git a/recipes/default.rb b/recipes/default.rb index c02cacf..60db77f 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -91,12 +91,21 @@ end end +if node['platform_family'] == "debian" + template "/etc/php5/fpm/pool.d/www.conf" do + source "www.conf.erb" + owner "root" + group "root" + mode 00644 + end +end + if node['platform'] == 'amazon' then php_fpm_service_name = "php-fpm" else php_fpm_service_name = "php5-fpm" end - +e service php_fpm_service_name do action [ :enable, :start ] end diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb new file mode 100644 index 0000000..e6ac53d --- /dev/null +++ b/templates/default/www.conf.erb @@ -0,0 +1,389 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = www-data +group = www-data + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = -1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0666 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = <%= node['php_fpm']['pm']['type'] -%>; + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = <%= node['php_fpm']['pm']['max_children'] -%>; + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = <%= node['php_fpm']['pm']['start_servers'] -%>; + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = <%= node['php_fpm']['pm']['min_spare_servers'] -%>; + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = <%= node['php_fpm']['pm']['max_spare_servers'] -%>; + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +pm.process_idle_timeout = <%= node['php_fpm']['pm']['process_idle_timeout'] -%>; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: ${prefix}/share/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +<%- if node['php_fpm']['pm']['status_path'] -%> +pm.status_path = <%= node['php_fpm']['pm']['status_path'] -%> +<%- else -%> +;pm.status_path = /status +<%- end -%> + + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: ouput header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%% + +; 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 + +; 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'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +chdir = / + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; 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_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M \ No newline at end of file From 988b192d4899e93fd5c68920c0ee16d3e730d211 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 00:19:49 -0500 Subject: [PATCH 03/18] typo --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 60db77f..3fc4fdf 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -105,7 +105,7 @@ else php_fpm_service_name = "php5-fpm" end -e + service php_fpm_service_name do action [ :enable, :start ] end From 81d29e3af13773cfbdb9f66ad81f399a1db50e6b Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 00:23:34 -0500 Subject: [PATCH 04/18] newline --- templates/default/www.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb index e6ac53d..0a55288 100644 --- a/templates/default/www.conf.erb +++ b/templates/default/www.conf.erb @@ -386,4 +386,4 @@ chdir = / ;php_flag[display_errors] = off ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M \ No newline at end of file +;php_admin_value[memory_limit] = 32M From bc0587722c2160fccc43c2ae9c033a492a05441a Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 17:12:39 -0500 Subject: [PATCH 05/18] set user --- recipes/default.rb | 1 + templates/default/www.conf.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 3fc4fdf..1d73b5a 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -97,6 +97,7 @@ owner "root" group "root" mode 00644 + notifies :restart, "service[#{php_fpm_service_name}]", :delayed end end diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb index 0a55288..a6708c4 100644 --- a/templates/default/www.conf.erb +++ b/templates/default/www.conf.erb @@ -19,8 +19,8 @@ ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group ; will be used. -user = www-data -group = www-data +user = <%= node['php_fpm']['user'] %> +group = <%= node['php_fpm']['user'] %> ; The address on which to accept FastCGI requests. ; Valid syntaxes are: From 18e40ab593244d2314d8849a805e1a7e2c5c42b1 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 15 Dec 2012 17:15:09 -0500 Subject: [PATCH 06/18] restart after config change --- recipes/default.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 1d73b5a..6cf6fcd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -91,16 +91,6 @@ end end -if node['platform_family'] == "debian" - template "/etc/php5/fpm/pool.d/www.conf" do - source "www.conf.erb" - owner "root" - group "root" - mode 00644 - notifies :restart, "service[#{php_fpm_service_name}]", :delayed - end -end - if node['platform'] == 'amazon' then php_fpm_service_name = "php-fpm" else @@ -110,3 +100,13 @@ service php_fpm_service_name do action [ :enable, :start ] end + +if node['platform_family'] == "debian" + template "/etc/php5/fpm/pool.d/www.conf" do + source "www.conf.erb" + owner "root" + group "root" + mode 00644 + notifies :restart, "service[#{php_fpm_service_name}]", :delayed + end +end \ No newline at end of file From 10a8dff3471e5c94bcafa5f588e14cfbb026e6a9 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sun, 16 Dec 2012 20:05:08 -0500 Subject: [PATCH 07/18] don't restart on config change --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 6cf6fcd..b0d7876 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -107,6 +107,6 @@ owner "root" group "root" mode 00644 - notifies :restart, "service[#{php_fpm_service_name}]", :delayed + notifies :reload, "service[#{php_fpm_service_name}]", :delayed end end \ No newline at end of file From b07388b00be2cae491c7304a396b91ef73a7bb86 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Mon, 17 Dec 2012 05:32:20 -0500 Subject: [PATCH 08/18] force encoding --- recipes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/default.rb b/recipes/default.rb index b0d7876..ab89843 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -17,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > "1.9" case node['platform'] when 'ubuntu' From be11b79b38ae50976cc5385392107d96b1076b50 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 12:09:19 -0500 Subject: [PATCH 09/18] allow ping config --- attributes/default.rb | 3 +++ templates/default/www.conf.erb | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index e039d98..3514b87 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,3 +1,4 @@ +default['php_fpm']['pool_name'] = "www" default['php_fpm']['pm']['type'] = "dynamic" default['php_fpm']['pm']['max_children'] = 10 default['php_fpm']['pm']['start_servers'] = 4 @@ -6,3 +7,5 @@ default['php_fpm']['pm']['process_idle_timeout'] = '10s' default['php_fpm']['pm']['max_requests'] = 0 default['php_fpm']['pm']['status_path'] = nil +default['php_fpm']['ping']['path'] = nil +default['php_fpm']['ping']['response'] = nil diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb index a6708c4..97eae29 100644 --- a/templates/default/www.conf.erb +++ b/templates/default/www.conf.erb @@ -1,7 +1,7 @@ ; Start a new pool named 'www'. ; the variable $pool can we used in any directive and will be replaced by the ; pool name ('www' here) -[www] +[<%= node['php_fpm']['pool_name'] %>] ; Per pool prefix ; It only applies on the following directives: @@ -231,11 +231,20 @@ pm.status_path = <%= node['php_fpm']['pm']['status_path'] -%> ; may conflict with a real PHP file. ; Default Value: not set ;ping.path = /ping +<%- if node['php_fpm']['ping_path'] -%> +ping.path = <%= node['php_fpm']['ping']['path'] -%> +<%- else -%> +;ping.path = /status +<%- end -%> ; This directive may be used to customize the response of a ping request. The ; response is formatted as text/plain with a 200 response code. ; Default Value: pong +<%- if node['php_fpm']['ping']['response'] -%> +ping.response = <%= node['php_fpm']['ping']['response'] -%> +<%- else -%> ;ping.response = pong +<%- end -%> ; The access log file ; Default: not set From 3271f737655c0936b27b2b0fa146a53b1750d118 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 12:11:53 -0500 Subject: [PATCH 10/18] allow ping config --- templates/default/www.conf.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb index 97eae29..b1443dc 100644 --- a/templates/default/www.conf.erb +++ b/templates/default/www.conf.erb @@ -230,8 +230,7 @@ pm.status_path = <%= node['php_fpm']['pm']['status_path'] -%> ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -;ping.path = /ping -<%- if node['php_fpm']['ping_path'] -%> +<%- if node['php_fpm']['ping']['path'] -%> ping.path = <%= node['php_fpm']['ping']['path'] -%> <%- else -%> ;ping.path = /status From 7b652fbe79299c81d8eefbf0a5cbf33185c69d50 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 14:48:48 -0500 Subject: [PATCH 11/18] better notifications --- recipes/default.rb | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index ab89843..e7ae7e3 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -92,22 +92,24 @@ end end -if node['platform'] == 'amazon' then - php_fpm_service_name = "php-fpm" -else - php_fpm_service_name = "php5-fpm" -end +php_fpm_service_name = case node['platform'] + when 'debian', 'ubuntu' + 'php5-fpm' + when 'centos', 'redhat', 'amazon' + 'php-fpm' + end -service php_fpm_service_name do +service "php-fpm" do action [ :enable, :start ] + service_name php_fpm_service_name + supports :restart => true, :start => true, :stop => true, :reload => true + subscribes :reload, "template[/etc/php5/fpm/pool.d/www.conf]", :immediately end -if node['platform_family'] == "debian" - template "/etc/php5/fpm/pool.d/www.conf" do - source "www.conf.erb" - owner "root" - group "root" - mode 00644 - notifies :reload, "service[#{php_fpm_service_name}]", :delayed - end -end \ No newline at end of file +template "/etc/php5/fpm/pool.d/www.conf" do + source "www.conf.erb" + owner "root" + group "root" + mode 00644 + only_if { platform?('platform_family') } +end From 87f0c5d124efe04c4883387ccac1a3ab46c4e9eb Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 15:04:19 -0500 Subject: [PATCH 12/18] fix bad platform check --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index e7ae7e3..8e87710 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -111,5 +111,5 @@ owner "root" group "root" mode 00644 - only_if { platform?('platform_family') } + only_if { platform?('debian') } end From e2fe4d0e844f7e2f1db027aae19d5ac6f139eb2d Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 15:06:48 -0500 Subject: [PATCH 13/18] actually fix bad platform check --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 8e87710..8937a6e 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -111,5 +111,5 @@ owner "root" group "root" mode 00644 - only_if { platform?('debian') } + only_if { platform_family?('debian') } end From 6b6f78b29aab46a0c3904a1c37e2cea6eeac50cf Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 15:14:09 -0500 Subject: [PATCH 14/18] srsly --- recipes/default.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 8937a6e..7d48299 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -92,12 +92,10 @@ end end -php_fpm_service_name = case node['platform'] - when 'debian', 'ubuntu' - 'php5-fpm' - when 'centos', 'redhat', 'amazon' - 'php-fpm' - end +php_fpm_service_name = values_for_platform( + ['debian', 'ubuntu'] => 'php5-fpm', + ['centos', 'redhat'] => 'php-fpm' +) service "php-fpm" do action [ :enable, :start ] @@ -111,5 +109,5 @@ owner "root" group "root" mode 00644 - only_if { platform_family?('debian') } + only_if { platform?('debian', 'ubuntu') } end From 7448f1def669db2e19fda13e4df87e6784664f54 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 15:17:56 -0500 Subject: [PATCH 15/18] bump --- recipes/default.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 7d48299..29537d3 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -92,9 +92,9 @@ end end -php_fpm_service_name = values_for_platform( - ['debian', 'ubuntu'] => 'php5-fpm', - ['centos', 'redhat'] => 'php-fpm' +php_fpm_service_name = values_for_platform_family( + 'debian' => 'php5-fpm', + 'rhel' => 'php-fpm' ) service "php-fpm" do From 13592ccab6b13d546481fa64fae1bebb5f11c302 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sat, 22 Dec 2012 15:21:27 -0500 Subject: [PATCH 16/18] bump --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 29537d3..e6be578 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -92,7 +92,7 @@ end end -php_fpm_service_name = values_for_platform_family( +php_fpm_service_name = value_for_platform_family( 'debian' => 'php5-fpm', 'rhel' => 'php-fpm' ) From 720231d6cbb556defb615233240e72376c3f78d9 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 15 Jan 2013 13:47:45 -0500 Subject: [PATCH 17/18] force custom template --- attributes/default.rb | 1 + recipes/default.rb | 9 --------- templates/default/www.conf.erb | 32 ++++++++++++++++---------------- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 3514b87..3bc9723 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,5 @@ default['php_fpm']['pool_name'] = "www" +default['php_fpm']['port'] = 9000 default['php_fpm']['pm']['type'] = "dynamic" default['php_fpm']['pm']['max_children'] = 10 default['php_fpm']['pm']['start_servers'] = 4 diff --git a/recipes/default.rb b/recipes/default.rb index e6be578..01a13b6 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -101,13 +101,4 @@ action [ :enable, :start ] service_name php_fpm_service_name supports :restart => true, :start => true, :stop => true, :reload => true - subscribes :reload, "template[/etc/php5/fpm/pool.d/www.conf]", :immediately -end - -template "/etc/php5/fpm/pool.d/www.conf" do - source "www.conf.erb" - owner "root" - group "root" - mode 00644 - only_if { platform?('debian', 'ubuntu') } end diff --git a/templates/default/www.conf.erb b/templates/default/www.conf.erb index b1443dc..740b53b 100644 --- a/templates/default/www.conf.erb +++ b/templates/default/www.conf.erb @@ -1,7 +1,7 @@ ; Start a new pool named 'www'. ; the variable $pool can we used in any directive and will be replaced by the ; pool name ('www' here) -[<%= node['php_fpm']['pool_name'] %>] +[<%= @php_fpm['pool_name'] %>] ; Per pool prefix ; It only applies on the following directives: @@ -19,8 +19,8 @@ ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group ; will be used. -user = <%= node['php_fpm']['user'] %> -group = <%= node['php_fpm']['user'] %> +user = <%= @php_fpm['user'] %> +group = <%= @php_fpm['user'] %> ; The address on which to accept FastCGI requests. ; Valid syntaxes are: @@ -30,7 +30,7 @@ group = <%= node['php_fpm']['user'] %> ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = 127.0.0.1:9000 +listen = 127.0.0.1:<%= @php_fpm['port'] %> ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -77,7 +77,7 @@ listen = 127.0.0.1:9000 ; pm.process_idle_timeout - The number of seconds after which ; an idle process will be killed. ; Note: This value is mandatory. -pm = <%= node['php_fpm']['pm']['type'] -%>; +pm = <%= @php_fpm['pm']['type'] -%>; ; The number of child processes to be created when pm is set to 'static' and the ; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. @@ -88,27 +88,27 @@ pm = <%= node['php_fpm']['pm']['type'] -%>; ; forget to tweak pm.* to fit your needs. ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' ; Note: This value is mandatory. -pm.max_children = <%= node['php_fpm']['pm']['max_children'] -%>; +pm.max_children = <%= @php_fpm['pm']['max_children'] -%>; ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = <%= node['php_fpm']['pm']['start_servers'] -%>; +pm.start_servers = <%= @php_fpm['pm']['start_servers'] -%>; ; The desired minimum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = <%= node['php_fpm']['pm']['min_spare_servers'] -%>; +pm.min_spare_servers = <%= @php_fpm['pm']['min_spare_servers'] -%>; ; The desired maximum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = <%= node['php_fpm']['pm']['max_spare_servers'] -%>; +pm.max_spare_servers = <%= @php_fpm['pm']['max_spare_servers'] -%>; ; The number of seconds after which an idle process will be killed. ; Note: Used only when pm is set to 'ondemand' ; Default Value: 10s -pm.process_idle_timeout = <%= node['php_fpm']['pm']['process_idle_timeout'] -%>; +pm.process_idle_timeout = <%= @php_fpm['pm']['process_idle_timeout'] -%>; ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For @@ -213,8 +213,8 @@ pm.max_requests = 500 ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -<%- if node['php_fpm']['pm']['status_path'] -%> -pm.status_path = <%= node['php_fpm']['pm']['status_path'] -%> +<%- if @php_fpm['pm']['status_path'] -%> +pm.status_path = <%= @php_fpm['pm']['status_path'] -%> <%- else -%> ;pm.status_path = /status <%- end -%> @@ -230,8 +230,8 @@ pm.status_path = <%= node['php_fpm']['pm']['status_path'] -%> ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set -<%- if node['php_fpm']['ping']['path'] -%> -ping.path = <%= node['php_fpm']['ping']['path'] -%> +<%- if @php_fpm['ping']['path'] -%> +ping.path = <%= @php_fpm['ping']['path'] -%> <%- else -%> ;ping.path = /status <%- end -%> @@ -239,8 +239,8 @@ ping.path = <%= node['php_fpm']['ping']['path'] -%> ; This directive may be used to customize the response of a ping request. The ; response is formatted as text/plain with a 200 response code. ; Default Value: pong -<%- if node['php_fpm']['ping']['response'] -%> -ping.response = <%= node['php_fpm']['ping']['response'] -%> +<%- if @php_fpm['ping']['response'] -%> +ping.response = <%= @php_fpm['ping']['response'] -%> <%- else -%> ;ping.response = pong <%- end -%> From eafc2deeeddbfd9cfd0976b64235c3ebee9f7c07 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 15 Jan 2013 23:33:38 -0500 Subject: [PATCH 18/18] fix max children --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 3bc9723..9a17b98 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,7 @@ default['php_fpm']['pool_name'] = "www" default['php_fpm']['port'] = 9000 default['php_fpm']['pm']['type'] = "dynamic" -default['php_fpm']['pm']['max_children'] = 10 +default['php_fpm']['pm']['max_children'] = 20 default['php_fpm']['pm']['start_servers'] = 4 default['php_fpm']['pm']['min_spare_servers'] = 6 default['php_fpm']['pm']['max_spare_servers'] = 12