Update more cookbooks

2017-06-16 11:25:49 +02:00
parent 7da2c5a738
commit f5858319a7
129 changed files with 1095 additions and 101571 deletions
--- a/cookbooks/php/recipes/default.rb
+++ b/cookbooks/php/recipes/default.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: default
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/php/recipes/ini.rb
+++ b/cookbooks/php/recipes/ini.rb
@@ -3,7 +3,7 @@
 # Cookbook:: php
 # Recipe:: ini
 #
-# Copyright:: 2011-2016, Chef Software, Inc.
+# Copyright:: 2011-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,10 +21,9 @@
 template "#{node['php']['conf_dir']}/php.ini" do
  source node['php']['ini']['template']
  cookbook node['php']['ini']['cookbook']
-  unless platform?('windows')
-    owner 'root'
-    group node['root_group']
-    mode '0644'
-  end
+  owner 'root'
+  group node['root_group']
+  mode '0644'
+  manage_symlink_source true
  variables(directives: node['php']['directives'])
 end
--- a/cookbooks/php/recipes/module_apc.rb
+++ b/cookbooks/php/recipes/module_apc.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_apc
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package %w(httpd-devel pcre pcre-devel)

  php_pear 'APC' do
--- a/cookbooks/php/recipes/module_apcu.rb
+++ b/cookbooks/php/recipes/module_apcu.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_apc
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package %w(httpd-devel pcre pcre-devel)

  php_pear 'APCu' do
--- a/cookbooks/php/recipes/module_curl.rb
+++ b/cookbooks/php/recipes/module_curl.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_curl
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/php/recipes/module_fpdf.rb
+++ b/cookbooks/php/recipes/module_fpdf.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_fpdf
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  pearhub_chan = php_pear_channel 'pearhub.org' do
    action :discover
  end
--- a/cookbooks/php/recipes/module_gd.rb
+++ b/cookbooks/php/recipes/module_gd.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_gd
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@

 pkg = value_for_platform(
  %w(centos redhat scientific fedora amazon oracle) => {
-    el5_range => 'php53-gd',
    'default' => 'php-gd',
  },
  'freebsd' => {
--- a/cookbooks/php/recipes/module_imap.rb
+++ b/cookbooks/php/recipes/module_imap.rb
@@ -18,7 +18,6 @@

 pkg = value_for_platform(
  %w(centos redhat scientific fedora amazon oracle) => {
-    el5_range => 'php53-imap',
    'default' => 'php-imap',
  },
  'default' => 'php5-imap'
--- a/cookbooks/php/recipes/module_ldap.rb
+++ b/cookbooks/php/recipes/module_ldap.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_ldap
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@

 pkg = value_for_platform(
  %w(centos redhat scientific fedora amazon oracle) => {
-    el5_range => 'php53-ldap',
    'default' => 'php-ldap',
  },
  'default' => node['php']['ldap']['package']
--- a/cookbooks/php/recipes/module_memcache.rb
+++ b/cookbooks/php/recipes/module_memcache.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_memcache
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package 'zlib-devel'

  php_pear 'memcache' do
--- a/cookbooks/php/recipes/module_mysql.rb
+++ b/cookbooks/php/recipes/module_mysql.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_mysql
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/php/recipes/module_pgsql.rb
+++ b/cookbooks/php/recipes/module_pgsql.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_pgsql
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@

 pkg = value_for_platform(
  %w(centos redhat scientific fedora amazon oracle) => {
-    el5_range => 'php53-pgsql',
    'default' => 'php-pgsql',
  },
  'default' => node['php']['pgsql']['package']
--- a/cookbooks/php/recipes/module_sqlite3.rb
+++ b/cookbooks/php/recipes/module_sqlite3.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: module_sqlite3
 #
-# Copyright:: 2009-2016, Chef Software, Inc.
+# Copyright:: 2009-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/php/recipes/package.rb
+++ b/cookbooks/php/recipes/package.rb
@@ -4,7 +4,7 @@
 # Cookbook:: php
 # Recipe:: package
 #
-# Copyright:: 2013-2016, Chef Software, Inc.
+# Copyright:: 2013-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,45 +19,13 @@
 # limitations under the License.
 #

-if platform?('windows')
-
-  include_recipe 'iis::mod_cgi'
-
-  install_dir = File.expand_path(node['php']['conf_dir']).tr('/', '\\')
-  windows_package node['php']['windows']['msi_name'] do
-    source node['php']['windows']['msi_source']
-    installer_type :msi
-
-    options %W(
-      /quiet
-      INSTALLDIR="#{install_dir}"
-      ADDLOCAL=#{node['php']['packages'].join(',')}
-    ).join(' ')
+if platform_family?('rhel', 'debian', 'amazon', 'suse')
+  package node['php']['packages'] do
+    options node['php']['package_options']
  end
-
-  # WARNING: This is not the out-of-the-box go-pear.phar. It's been modified to patch this bug:
-  # http://pear.php.net/bugs/bug.php?id=16644
-  cookbook_file "#{node['php']['conf_dir']}/PEAR/go-pear.phar" do
-    source 'go-pear.phar'
-  end
-
-  template "#{node['php']['conf_dir']}/pear-options" do
-    source 'pear-options.erb'
-  end
-
-  execute 'install-pear' do
-    cwd node['php']['conf_dir']
-    command 'go-pear.bat < pear-options'
-    creates "#{node['php']['conf_dir']}/pear.bat"
-  end
-
-  ENV['PATH'] += ";#{install_dir}"
-  windows_path install_dir
-
 else
  node['php']['packages'].each do |pkg|
    package pkg do
-      action :install
      options node['php']['package_options']
    end
  end
--- a/cookbooks/php/recipes/recompile.rb
+++ b/cookbooks/php/recipes/recompile.rb
@@ -3,7 +3,7 @@
 # Cookbook:: php
 # Recipe:: recompile
 #
-# Copyright:: 2014-2016, David Kinzer
+# Copyright:: 2014-2017, David Kinzer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/php/recipes/source.rb
+++ b/cookbooks/php/recipes/source.rb
@@ -3,7 +3,7 @@
 # Cookbook:: php
 # Recipe:: source
 #
-# Copyright:: 2011-2016, Chef Software, Inc.
+# Copyright:: 2011-2017, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.