Add templating for status and ping pages

README.md

@@ -57,13 +57,13 @@ override_attributes "php-fpm" => {
 ## Create PHP-FPM pool named 'www' with default settings:
 
 ```ruby
-php_fpm_pool "www"
+php_fpm_fpm_pool "www"
 ```
 
 ## Create PHP-FPM pool named 'www' with custom settings:
 
 ```ruby
-php_fpm_pool "www" do
+php_fpm_fpm_pool "www" do
   cookbook "another-cookbook" # get template from another cookbook
   process_manager "dynamic"
   max_requests 5000
@@ -74,7 +74,7 @@ end
 ## Delete PHP-FPM pool named 'www':
 
 ```ruby
-php_fpm_pool "www" do
+php_fpm_fpm_pool "www" do
   enable false
 end
 ```

definitions/php_fpm_pool.rb → definitions/php_fpm_fpm_pool.rb

@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: php-fpm
-# Definition:: php_fpm_pool
+# Definition:: php_fpm_fpm_pool
 #
 # Copyright 2008-2017, Chef Software, Inc.
 #
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-define :php_fpm_pool, template: 'pool.conf.erb', enable: true do
+define :php_fpm_fpm_pool, template: 'pool.conf.erb', enable: true do
   pool_name = params[:name]
 
   conf_file = "#{node['php-fpm']['pool_conf_dir']}/#{pool_name}.conf"
@@ -52,6 +52,8 @@
         request_slowlog_timeout: params[:request_slowlog_timeout] || false,
         php_options: params[:php_options] || {},
         request_terminate_timeout: params[:request_terminate_timeout] || node['php-fpm']['request_terminate_timeout'],
+        status_path: params[:status_path],
+        ping_path: params[:ping_path],
         params: params
       )
       notifies :restart, 'service[php-fpm]'

recipes/configure.rb

@@ -34,7 +34,7 @@
     else
       pool_name = pool[:name]
     end
-    php_fpm_pool pool_name do
+    php_fpm_fpm_pool pool_name do
       pool.each do |k, v|
         params[k.to_sym] = v
       end

templates/pool.conf.erb

@@ -236,7 +236,11 @@ pm.max_requests = <%= @max_requests %>
 ;       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 @status_path %>
+pm.status_path = <%= @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
@@ -248,7 +252,11 @@ pm.max_requests = <%= @max_requests %>
 ;       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 @ping_path %>
+ping.path = <%= @ping_path %>
+<% else %>
 ;ping.path = /ping
+<% 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.