Bump to v0.5.0. Add support for PHP5.6-FPM on Ubuntu. Add some cosmetic changes.

+## 0.5.0 - 2016-11-22
+### Added
+- PHP-FPM recipe: Add support for PHP5.6-FPM on Ubuntu. On other platforms, setting the version to '5.6' will generate a fatal error.
+
+### Changed
+- Nginx recipe: Shorten filenames of included config files (remove "inc" prefix).
+
 ## 0.4.4 - 2016-11-09
 ### Added
 - Nginx recipe: Add template file customization for the main site config and for all site types.

@@ -27,7 +27,13 @@ Ubuntu 14.04
     <td><tt>['cfe-nginx-php-fpm']['php-fpm']['exts']</tt></td>
     <td>Array</td>
     <td>PHP extension packages to be installed. Without the "php5-" or "php-" prefix.</td>
-    <td><tt>['mysqlnd', 'cli', 'curl']</tt></td>
+    <td><tt>['mysqlnd', 'cli', 'curl', 'zip']</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-nginx-php-fpm']['php-fpm']['version']</tt></td>
+    <td>String</td>
+    <td>PHP version. Can only be either '5.5' (the default) or '5.6'.</td>
+    <td><tt>'5.5'</tt></td>
   </tr>
   <tr>
     <td><tt>['cfe-nginx-php-fpm']['openssl']['dh_modulus']</tt></td>

@@ -23,12 +23,14 @@
 default['cfe-nginx-php-fpm']['postfix']['update_cacert'] = true
 default['cfe-nginx-php-fpm']['postfix']['email_domain']  = 'example.com'
 
+# Version is either '5.5' (default) or '5.6'
+default['cfe-nginx-php-fpm']['php-fpm']['version'] = '5.5'
 # If your php-fpm pool is not named 'www', then delete
 # the default one ('www'), which is automatically installed by php-fpm
 default['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] = true
-default['cfe-nginx-php-fpm']['php-fpm']['exts'] = [
-  'mysqlnd', 'cli', 'curl'
-]
+default['cfe-nginx-php-fpm']['php-fpm']['exts'] = %w{
+  mysqlnd cli curl zip
+}
 
 default['cfe-nginx-php-fpm']['openssl']['dh_modulus'] = 4096
 
@@ -262,6 +264,17 @@ default['php-fpm']['pools'] = [
   }
 ]
 
+if node['cfe-nginx-php-fpm']['php-fpm']['version'] == '5.6'
+  case node['platform']
+  when 'ubuntu'
+    default['php-fpm']['conf_file']     = '/etc/php/5.6/fpm/php-fpm.conf'
+    default['php-fpm']['conf_dir']      = '/etc/php/5.6/fpm/conf.d'
+    default['php-fpm']['pool_conf_dir'] = '/etc/php/5.6/fpm/pool.d'
+    default['php-fpm']['package_name']  = 'php5.6-fpm'
+    default['php-fpm']['service_name']  = 'php5.6-fpm'
+  end
+end
+
 #
 # mariadb cookbook
 #

@@ -37,8 +37,14 @@ define :php_ext, :action => :install do
     end
 
   when 'debian'
+    str = ''
+    str = if node['platform'] == 'ubuntu' &&
+             node['cfe-nginx-php-fpm']['php-fpm']['version'] == '5.6'
+      '.6'
+    end
+
     unless rhel_only.include?(params[:name])
-      package "php5-#{params[:name]}" do
+      package "php5#{str}-#{params[:name]}" do
         action params[:action]
       end
 

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

@@ -213,17 +213,17 @@ node[cb]['nginx']['sites'].each do |site|
         stype.has_key?(:fastcgi_intercept_errors) ?
         stype[:fastcgi_intercept_errors] : false
 
-      template "#{inc_dir}/inc_type_wordpress_#{site_sname}" do
+      template "#{inc_dir}/type_wordpress_#{site_sname}" do
         source    stype[:source] || 'inc_type_wordpress.erb'
         cookbook  stype[:cookbook] || cb
         mode      0644
         variables vars
       end
-      site_includes.push("#{inc_dir}/inc_type_wordpress_#{site_sname}")
+      site_includes.push("#{inc_dir}/type_wordpress_#{site_sname}")
 
     # REVERSE PROXY WEBSERVER WITH WEBSOCKET
     when 'webserver', 'webserver_ws'
-      template "#{inc_dir}/inc_type_webserver_ws_#{site_sname}" do
+      template "#{inc_dir}/type_webserver_ws_#{site_sname}" do
         source    stype[:source] || 'inc_type_webserver.erb'
         cookbook  stype[:cookbook] || cb
         mode      0644
@@ -233,17 +233,17 @@ node[cb]['nginx']['sites'].each do |site|
                     "    default upgrade;\n"\
                     "    ''      close;\n"\
                     "}")
-      site_includes.push("#{inc_dir}/inc_type_webserver_ws_#{site_sname}")
+      site_includes.push("#{inc_dir}/type_webserver_ws_#{site_sname}")
 
     # GENERIC REVERSE PROXY WEBSERVER
     when 'webserver_basic'
-      template "#{inc_dir}/inc_type_webserver_basic_#{site_sname}" do
+      template "#{inc_dir}/type_webserver_basic_#{site_sname}" do
         source    stype[:source] || 'inc_type_webserver_basic.erb'
         cookbook  stype[:cookbook] || cb
         mode      0644
         variables vars
       end
-      site_includes.push("#{inc_dir}/inc_type_webserver_basic_#{site_sname}")
+      site_includes.push("#{inc_dir}/type_webserver_basic_#{site_sname}")
 
     else
       Chef::Log.error("Unknown site type: #{stype[:type]}")

@@ -30,6 +30,21 @@ end
 node.default['php-fpm']['user']  = node['nginx']['user']
 node.default['php-fpm']['group'] = node['nginx']['group']
 
+if node['cfe-nginx-php-fpm']['php-fpm']['version'] == '5.6'
+  case node['platform']
+  when 'ubuntu'
+    apt_repository 'ondrej-php' do
+      uri          'ppa:ondrej/php'
+      distribution node['lsb']['codename']
+      components   ['main']
+      keyserver    'keyserver.ubuntu.com'
+      key          'E5267A6C'
+    end
+  else
+    Chef::Application.fatal!("No support for PHP5.6-FPM on #{node['platform']}")
+  end
+end
+
 if node['php-fpm']['pools']
   def_pm = value_for_platform(
     'ubuntu'  => { '10.04' => 'dynamic' },