Bump to v0.2.1. Add defaults to php-fpm.

@@ -17,7 +17,7 @@ provisioner:
 platforms:
 platforms:
   - name: ubuntu-14.04
   - name: ubuntu-14.04
     driver:
     driver:
-      image_id: ami-3d2cce5d
+      image_id: ami-50946030
     transport:
     transport:
       username: ubuntu
       username: ubuntu
       ssh_key: ~/.ssh/cfe_stg_20160222.pem
       ssh_key: ~/.ssh/cfe_stg_20160222.pem

+# 0.2.1
+
+Add some defaults for php-fpm
+
 # 0.2.0
 # 0.2.0
 
 
 Add basic proxied webserver config
 Add basic proxied webserver config

@@ -124,7 +124,10 @@ default['cfe-nginx-php-fpm']['nginx']['sites'] = [
 #override['php-fpm']['user']  = node['nginx']['user']
 #override['php-fpm']['user']  = node['nginx']['user']
 #override['php-fpm']['group'] = node['nginx']['group']
 #override['php-fpm']['group'] = node['nginx']['group']
 
 
-default['php-fpm']['skip_repository_install'] = true
+default['php-fpm']['skip_repository_install']     = true
+default['php-fpm']['emergency_restart_threshold'] = '10'
+default['php-fpm']['emergency_restart_interval']  = '1m'
+default['php-fpm']['process_control_timeout']     = '10s'
 default['php-fpm']['pools'] = [
 default['php-fpm']['pools'] = [
   # Most likely, just use one pool for all PHP needs.
   # Most likely, just use one pool for all PHP needs.
   # (But there are exceptions, of course)
   # (But there are exceptions, of course)
@@ -139,30 +142,28 @@ default['php-fpm']['pools'] = [
     #:user   => node['nginx']['user'],
     #:user   => node['nginx']['user'],
     #:group  => node['nginx']['group'],
     #:group  => node['nginx']['group'],
 
 
-    :max_requests => 500,
-    :max_children => 50,
+    #:max_requests => 500,
+    #:max_children => 50,
 
 
-    :access_log           => false,
-    :catch_workers_output => 'no',
+    #:access_log           => false,
+    #:catch_workers_output => 'no',
 
 
-    :process_manager => value_for_platform(
-      'ubuntu' => {
-        '10.04' => 'dynamic'
-      },
-      'default' => 'ondemand'
-    ),
+    #:process_manager => value_for_platform(
+    #  'ubuntu'  => { '10.04' => 'dynamic' },
+    #  'default' => 'ondemand'
+    #),
 
 
     # Only used if process_manager is 'dynamic':
     # Only used if process_manager is 'dynamic':
-    :start_servers     => 5,
-    :min_spare_servers => 5,
-    :max_spare_servers => 35,
-
-    :php_options => {
-      'php_admin_value[cgi.fix_pathinfo]' => '0',
-      'php_admin_value[expose_php]'       => 'Off',
-      'php_value[upload_max_filesize]'    => '5M',
-      'php_value[post_max_size]'          => '10M'
-    }
+    #:start_servers     => 5,
+    #:min_spare_servers => 5,
+    #:max_spare_servers => 35,
+
+    #:php_options => {
+    #  'php_admin_value[cgi.fix_pathinfo]' => '0',
+    #  'php_admin_value[expose_php]'       => 'Off',
+    #  'php_value[upload_max_filesize]'    => '5M',
+    #  'php_value[post_max_size]'          => '10M'
+    #}
   }
   }
 ]
 ]
 
 

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 license          'Apache License'
 description      'Simplifies setup of Nginx+PHP-FPM in Chromedia.'
 description      'Simplifies setup of Nginx+PHP-FPM in Chromedia.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
+version          '0.2.1'
 
 
 {
 {
   'php-fpm' => '0.7.5',
   'php-fpm' => '0.7.5',

@@ -31,6 +31,17 @@ node.default['php-fpm']['user']  = node['nginx']['user']
 node.default['php-fpm']['group'] = node['nginx']['group']
 node.default['php-fpm']['group'] = node['nginx']['group']
 
 
 if node['php-fpm']['pools']
 if node['php-fpm']['pools']
+  def_pm = value_for_platform(
+    'ubuntu'  => { '10.04' => 'dynamic' },
+    'default' => 'ondemand'
+  )
+  def_php_opts = {
+    'php_admin_value[cgi.fix_pathinfo]' => '0',
+    'php_admin_value[expose_php]'       => 'Off',
+    'php_value[upload_max_filesize]'    => '5M',
+    'php_value[post_max_size]'          => '10M'
+  }
+
   is_hash = node['php-fpm']['pools'].is_a?(Hash) # either Hash or Array
   is_hash = node['php-fpm']['pools'].is_a?(Hash) # either Hash or Array
   meth = node['php-fpm']['pools'].method( is_hash ? :each : :each_with_index )
   meth = node['php-fpm']['pools'].method( is_hash ? :each : :each_with_index )
   meth.call do |el1, el2|
   meth.call do |el1, el2|
@@ -38,8 +49,10 @@ if node['php-fpm']['pools']
     pool  = is_hash ? el2 : el1
     pool  = is_hash ? el2 : el1
     pool2 = mash_to_hash(pool)
     pool2 = mash_to_hash(pool)
 
 
-    pool2['user']   = node['nginx']['user'] unless pool['user']
-    pool2['group']  = node['nginx']['user'] unless pool['group']
+    pool2['process_manager'] = def_pm unless pool['process_manager']
+    pool2['php_options']     = def_php_opts unless pool['php_options']
+    pool2['user']            = node['nginx']['user'] unless pool['user']
+    pool2['group']           = node['nginx']['user'] unless pool['group']
     pool2['listen'] =
     pool2['listen'] =
       node['cfe-nginx-php-fpm']['php_fastcgi_socket'] unless pool['listen']
       node['cfe-nginx-php-fpm']['php_fastcgi_socket'] unless pool['listen']