Update cookbooks for Ubuntu 16.04 TLS

cookbooks/php/resources/fpm_pool.rb

@@ -1,9 +1,9 @@
 #
 # Author:: Chris Marchesi <cmarchesi@paybyphone.com>
-# Cookbook Name:: php
+# Cookbook:: php
 # Resource:: fpm_pool
 #
-# Copyright:: 2015, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2015-2016, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,14 +21,16 @@
 default_action :install
 actions :install, :uninstall
 
-attribute :pool_name, :kind_of => String, :name_attribute => true
-attribute :listen, :default => '/var/run/php5-fpm.sock'
-attribute :user, :kind_of => String, :default => node['php']['fpm_user']
-attribute :group, :kind_of => String, :default => node['php']['fpm_user']
-attribute :process_manager, :kind_of => String, :default => 'dynamic'
-attribute :max_children, :kind_of => Integer, :default => 5
-attribute :start_servers, :kind_of => Integer, :default => 2
-attribute :min_spare_servers, :kind_of => Integer, :default => 1
-attribute :max_spare_servers, :kind_of => Integer, :default => 3
-attribute :chdir, :kind_of => String, :default => '/'
-attribute :additional_config, :kind_of => Hash, :default => {}
+attribute :pool_name, kind_of: String, name_attribute: true
+attribute :listen, kind_of: String, default: node['php']['fpm_socket']
+attribute :user, kind_of: String, default: node['php']['fpm_user']
+attribute :group, kind_of: String, default: node['php']['fpm_group']
+attribute :listen_user, kind_of: String, default: node['php']['fpm_listen_user']
+attribute :listen_group, kind_of: String, default: node['php']['fpm_listen_group']
+attribute :process_manager, kind_of: String, default: 'dynamic'
+attribute :max_children, kind_of: Integer, default: 5
+attribute :start_servers, kind_of: Integer, default: 2
+attribute :min_spare_servers, kind_of: Integer, default: 1
+attribute :max_spare_servers, kind_of: Integer, default: 3
+attribute :chdir, kind_of: String, default: '/'
+attribute :additional_config, kind_of: Hash, default: {}

cookbooks/php/resources/pear.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
-# Cookbook Name:: php
+# Author:: Seth Chisamore <schisamo@chef.io>
+# Cookbook:: php
 # Resource:: pear_package
 #
-# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
+# Copyright:: 2011-2016, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,10 +29,10 @@ state_attrs :channel,
             :version,
             :zend_extensions
 
-attribute :package_name, :kind_of => String, :name_attribute => true
-attribute :version, :default => nil
-attribute :channel, :kind_of => String
-attribute :options, :kind_of => String
-attribute :directives, :kind_of => Hash, :default => {}
-attribute :zend_extensions, :kind_of => Array, :default => []
-attribute :preferred_state, :default => 'stable'
+attribute :package_name, kind_of: String, name_attribute: true
+attribute :version, default: nil
+attribute :channel, kind_of: String
+attribute :options, kind_of: String
+attribute :directives, kind_of: Hash, default: {}
+attribute :zend_extensions, kind_of: Array, default: []
+attribute :preferred_state, default: 'stable'

cookbooks/php/resources/pear_channel.rb

@@ -1,9 +1,10 @@
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
-# Cookbook Name:: php
+# Author:: Seth Chisamore <schisamo@chef.io>
+# Author:: Jennifer Davis <sigje@chef.io>
+# Cookbook:: php
 # Resource:: pear_channel
 #
-# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
+# Copyright:: 2011-2017, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,14 +20,65 @@
 #
 
 default_action :discover
-actions :discover, :add, :update, :remove
-
-state_attrs :channel_name,
-            :channel_xml
-
-attribute :channel_name, :kind_of => String, :name_attribute => true
-attribute :channel_xml, :kind_of => String
-
+property :channel_xml, kind_of: String
+property :channel_name, kind_of: String, name_property: true
+property :pear, kind_of: String, default: 'pear'
 # TODO: add authenticated channel support!
-# attribute :username, :kind_of => String
-# attribute :password, :kind_of => String
+# property :username, :kind_of => String
+# property :password, :kind_of => String
+
+action_class do
+  def exists?
+    shell_out!("#{@new_resource.pear} channel-info #{@new_resource.channel_name}")
+    true
+  rescue Mixlib::ShellOut::ShellCommandFailed
+    false
+  end
+end
+
+action :discover do
+  unless exists?
+    Chef::Log.info("Discovering pear channel #{@new_resource}")
+    execute "#{@new_resource.pear} channel-discover #{@new_resource.channel_name}" do
+      action :run
+    end
+  end
+end
+
+action :add do
+  unless exists?
+    Chef::Log.info("Adding pear channel #{@new_resource} from #{@new_resource.channel_xml}")
+    execute "#{@new_resource.pear} channel-add #{@new_resource.channel_xml}" do
+      action :run
+    end
+  end
+end
+
+action :update do
+  if exists?
+    update_needed = false
+    begin
+      update_needed = true if shell_out("#{@new_resource.pear} search -c #{@new_resource.channel_name} NNNNNN").stdout =~ /channel-update/
+    rescue Chef::Exceptions::CommandTimeout
+      # CentOS can hang on 'pear search' if a channel needs updating
+      Chef::Log.info("Timed out checking if channel-update needed...forcing update of pear channel #{@new_resource}")
+      update_needed = true
+    end
+    if update_needed
+      description = "update pear channel #{@new_resource}"
+      converge_by(description) do
+        Chef::Log.info("Updating pear channel #{@new_resource}")
+        shell_out!("#{@new_resource.pear} channel-update #{@new_resource.channel_name}")
+      end
+    end
+  end
+end
+
+action :remove do
+  if exists?
+    Chef::Log.info("Deleting pear channel #{@new_resource}")
+    execute "#{@new_resource.pear} channel-delete #{@new_resource.channel_name}" do
+      action :run
+    end
+  end
+end