Added support for ubuntu 16.04 via Ondrejs ppa

.kitchen.yml

@@ -7,6 +7,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-12.04
+  - name: ubuntu-16.04
   - name: centos-6.4
   - name: fedora-21
 

attributes/default.rb

@@ -12,10 +12,16 @@
   group = "www-data"
   conf_dir = "/etc/php5/fpm/conf.d"
   pool_conf_dir = "/etc/php5/fpm/pool.d"
-  if node.platform == "ubuntu" and node.platform_version.to_f <= 10.04
-    conf_file = "/etc/php5/fpm/php5-fpm.conf"
-  else
-    conf_file = "/etc/php5/fpm/php-fpm.conf"
+  if node.platform == "ubuntu" 
+    if node.platform_version.to_f <= 10.04
+      conf_file = "/etc/php5/fpm/php5-fpm.conf"
+    elsif node.platform_version.to_f <= 16.04
+      conf_file = "/etc/php/5.6/fpm/php-fpm.conf"
+      pool_conf_dir = "/etc/php/5.6/fpm/pool.d"
+      default['php-fpm']['package_name'] = 'php5.6-fpm'
+    else
+      conf_file = "/etc/php5/fpm/php-fpm.conf"
+    end
   end
   error_log = "/var/log/php5-fpm.log"
   pid ="/var/run/php5-fpm.pid"

metadata.rb

@@ -4,7 +4,7 @@
 license          "Apache 2.0"
 description      "Installs/Configures php-fpm"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.7.6"
+version          "0.8.0"
 
 depends "apt"
 depends "yum", ">= 3.0"

recipes/install.rb

@@ -43,8 +43,12 @@
 end
 
 service_provider = nil
-if node['platform'] == 'ubuntu' and node['platform_version'].to_f >= 13.10
-  service_provider = ::Chef::Provider::Service::Upstart
+if node['platform'] == 'ubuntu' 
+  if node['platform_version'].to_f >= 15.10
+    service_provider = ::Chef::Provider::Service::Systemd
+  elsif node['platform_version'].to_f >= 13.10
+    service_provider = ::Chef::Provider::Service::Upstart
+  end
 end
 
 directory node['php-fpm']['log_dir']

recipes/repository.rb

@@ -31,9 +31,18 @@
       key "8D0DC64F"
       action :add
     end
-    # FIXME: apt-get update didn't trigger in above
-    execute "apt-get update"
+  elsif node['platform_version'].to_f <= 16.04
+    # Configure Ondrej's PPA
+    # We'll install php5.6-fpm from the Brian's PPA backports
+    apt_repository "ondrej" do
+      uri 'ppa:ondrej/php' 
+      components ['main']
+      key '4F4EA0AAE5267A6C'
+      keyserver 'keyserver.ubuntu.com'
+      action :add
+    end
   end
+  execute "apt-get update"
 when 'debian'
   # Configure Dotdeb repos
   # TODO: move this to it's own 'dotdeb' cookbook?