Downgrade mysql cookbook for now

It doesn't play well with our current dev server setup
2017-06-16 22:43:51 +02:00
parent e39792ea36
commit bdfb3a1afb
398 changed files with 12716 additions and 10889 deletions
--- a/cookbooks/apache2/recipes/default.rb
+++ b/cookbooks/apache2/recipes/default.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: default
 #
-# Copyright 2008-2013, Chef Software, Inc.
-# Copyright 2014-2015, Alexander van Zoest
+# Copyright:: 2008-2013, Chef Software, Inc.
+# Copyright:: 2014-2015, Alexander van Zoest
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,8 +18,9 @@
 # limitations under the License.
 #

-package 'apache2' do
+package 'apache2' do # ~FC009 only available in apt_package. See #388
  package_name node['apache']['package']
+  default_release node['apache']['default_release'] unless node['apache']['default_release'].nil?
 end

 %w(sites-available sites-enabled mods-available mods-enabled conf-available conf-enabled).each do |dir|
@@ -43,18 +44,16 @@ end
  end
 end

-directory "#{node['apache']['dir']}/conf.d" do
-  action :delete
-  recursive true
-end
-
 directory node['apache']['log_dir'] do
  mode '0755'
+  recursive true
 end

 # perl is needed for the a2* scripts
 package node['apache']['perl_pkg']

+package 'perl-Getopt-Long-Descriptive' if platform?('fedora')
+
 %w(a2ensite a2dissite a2enmod a2dismod a2enconf a2disconf).each do |modscript|
  link "/usr/sbin/#{modscript}" do
    action :delete
@@ -82,9 +81,6 @@ unless platform_family?('debian')
    command "/usr/local/bin/apache2_module_conf_generate.pl #{node['apache']['lib_dir']} #{node['apache']['dir']}/mods-available"
    action :nothing
  end
-
-  # enable mod_deflate for consistency across distributions
-  include_recipe 'apache2::mod_deflate'
 end

 if platform_family?('freebsd')
@@ -128,7 +124,7 @@ end

 directory node['apache']['lock_dir'] do
  mode '0755'
-  if node['platform_family'] == 'debian' && node['apache']['version'] == '2.2'
+  if node['platform_family'] == 'debian'
    owner node['apache']['user']
  else
    owner 'root'
@@ -143,7 +139,7 @@ template "/etc/sysconfig/#{node['apache']['package']}" do
  group node['apache']['root_group']
  mode '0644'
  notifies :restart, 'service[apache2]', :delayed
-  only_if  { platform_family?('rhel', 'fedora', 'suse') }
+  only_if  { platform_family?('rhel', 'amazon', 'fedora', 'suse') }
 end

 template "#{node['apache']['dir']}/envvars" do
@@ -156,7 +152,7 @@ template "#{node['apache']['dir']}/envvars" do
 end

 template 'apache2.conf' do
-  if platform_family?('rhel', 'fedora', 'arch', 'freebsd')
+  if platform_family?('rhel', 'amazon', 'fedora', 'arch', 'freebsd')
    path "#{node['apache']['conf_dir']}/httpd.conf"
  elsif platform_family?('debian')
    path "#{node['apache']['conf_dir']}/apache2.conf"
@@ -182,8 +178,7 @@ apache_conf 'ports' do
  conf_path node['apache']['dir']
 end

-if node['apache']['version'] == '2.4' && !platform_family?('freebsd')
-  # on freebsd the prefork mpm is staticly compiled in
+if node['apache']['version'] == '2.4'
  if node['apache']['mpm_support'].include?(node['apache']['mpm'])
    include_recipe "apache2::mpm_#{node['apache']['mpm']}"
  else
@@ -203,18 +198,22 @@ if node['apache']['default_site_enabled']
  end
 end

+apache_service_name = node['apache']['service_name']
+
 service 'apache2' do
-  service_name node['apache']['service_name']
+  service_name apache_service_name
  case node['platform_family']
  when 'rhel'
-    restart_command '/sbin/service httpd restart && sleep 1' if node['apache']['version'] == '2.2'
-    reload_command '/sbin/service httpd graceful'
+    if node['platform_version'].to_f < 7.0 && node['apache']['version'] != '2.4'
+      restart_command "/sbin/service #{apache_service_name} restart && sleep 1"
+      reload_command "/sbin/service #{apache_service_name} graceful && sleep 1"
+    end
  when 'debian'
    provider Chef::Provider::Service::Debian
  when 'arch'
-    service_name 'httpd'
+    service_name apache_service_name
  end
  supports [:start, :restart, :reload, :status]
  action [:enable, :start]
-  only_if "#{node['apache']['binary']} -t", :environment => { 'APACHE_LOG_DIR' => node['apache']['log_dir'] }, :timeout => 10
+  only_if "#{node['apache']['binary']} -t", environment: { 'APACHE_LOG_DIR' => node['apache']['log_dir'] }, timeout: 10
 end
--- a/cookbooks/apache2/recipes/mod_access_compat.rb
+++ b/cookbooks/apache2/recipes/mod_access_compat.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_access_compat
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_actions.rb
+++ b/cookbooks/apache2/recipes/mod_actions.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_actions
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_alias.rb
+++ b/cookbooks/apache2/recipes/mod_alias.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_alias
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_allowmethods.rb
+++ b/cookbooks/apache2/recipes/mod_allowmethods.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_allowmethods
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_apreq2.rb
+++ b/cookbooks/apache2/recipes/mod_apreq2.rb
@@ -1,10 +1,10 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: apreq2
 #
 # modified from the python recipe by Jeremy Bingham
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -28,7 +28,7 @@ when 'suse'
  package 'apache2-mod_apreq2' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package 'libapreq2' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end
@@ -43,8 +43,8 @@ when 'rhel', 'fedora'
 end

 file "#{node['apache']['dir']}/conf.d/apreq.conf" do
-  action :delete
-  backup false
+  content '# conf is under mods-available/apreq.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end

 apache_module 'apreq'
--- a/cookbooks/apache2/recipes/mod_asis.rb
+++ b/cookbooks/apache2/recipes/mod_asis.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_asis
 #
-# Copyright 2008-2009, Chef Software, Inc.
+# Copyright:: 2008-2009, 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/apache2/recipes/mod_auth_basic.rb
+++ b/cookbooks/apache2/recipes/mod_auth_basic.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_auth_basic
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_auth_cas.rb
+++ b/cookbooks/apache2/recipes/mod_auth_cas.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_auth_cas
 #
-# Copyright 2013, Chef Software, Inc.
+# Copyright:: 2013, 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.
@@ -45,14 +45,14 @@ else
  when 'debian'
    package 'libapache2-mod-auth-cas'

-  when 'rhel', 'fedora'
+  when 'rhel', 'fedora', 'amazon'
    yum_package 'mod_auth_cas' do
      notifies :run, 'execute[generate-module-list]', :immediately
    end

    file "#{node['apache']['dir']}/conf.d/auth_cas.conf" do
-      action :delete
-      backup false
+      content '# conf is under mods-available/auth_cas.conf - apache2 cookbook\n'
+      only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
    end
  end
 end
--- a/cookbooks/apache2/recipes/mod_auth_digest.rb
+++ b/cookbooks/apache2/recipes/mod_auth_digest.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_auth_digest
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_auth_form.rb
+++ b/cookbooks/apache2/recipes/mod_auth_form.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_auth_form
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_auth_openid.rb
+++ b/cookbooks/apache2/recipes/mod_auth_openid.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_auth_openid
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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 @@
 openid_dev_pkgs = value_for_platform_family(
  'debian'        => %W(automake make g++ #{node['apache']['devel_package']} libopkele-dev libopkele3 libtool),
  'suse'          => %W(automake make g++ #{node['apache']['devel_package']} libopkele-dev libopkele3 libtool),
-  %w(rhel fedora) => %W(gcc-c++ #{node['apache']['devel_package']} curl-devel libtidy libtidy-devel sqlite-devel pcre-devel openssl-devel make libtool),
+  %w(rhel fedora amazon) => %W(gcc-c++ #{node['apache']['devel_package']} curl-devel libtidy libtidy-devel sqlite-devel pcre-devel openssl-devel make libtool),
  'arch'          => %w(libopkele),
  'freebsd'       => %w(libopkele pcre sqlite3)
 )
@@ -44,7 +44,7 @@ else
 end

 case node['platform_family']
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  remote_file "#{Chef::Config['file_cache_path']}/libopkele-2.0.4.tar.gz" do
    source 'http://kin.klever.net/dist/libopkele-2.0.4.tar.gz'
    mode '0644'
--- a/cookbooks/apache2/recipes/mod_authn_anon.rb
+++ b/cookbooks/apache2/recipes/mod_authn_anon.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_anon
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authn_core.rb
+++ b/cookbooks/apache2/recipes/mod_authn_core.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_core
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authn_dbd.rb
+++ b/cookbooks/apache2/recipes/mod_authn_dbd.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_dbd
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authn_dbm.rb
+++ b/cookbooks/apache2/recipes/mod_authn_dbm.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_dbm
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authn_file.rb
+++ b/cookbooks/apache2/recipes/mod_authn_file.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_file
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_authn_socache.rb
+++ b/cookbooks/apache2/recipes/mod_authn_socache.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authn_socache
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authnz_fcgi.rb
+++ b/cookbooks/apache2/recipes/mod_authnz_fcgi.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_authnz_fcgi
+#
+# Copyright:: 2016, Alexander van Zoest
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authnz_fcgi'
--- a/cookbooks/apache2/recipes/mod_authnz_ldap.rb
+++ b/cookbooks/apache2/recipes/mod_authnz_ldap.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authnz_ldap
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_authz_core.rb
+++ b/cookbooks/apache2/recipes/mod_authz_core.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_core
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authz_dbd.rb
+++ b/cookbooks/apache2/recipes/mod_authz_dbd.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_dbd
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authz_dbm.rb
+++ b/cookbooks/apache2/recipes/mod_authz_dbm.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_dbm
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authz_default.rb
+++ b/cookbooks/apache2/recipes/mod_authz_default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_default
 #
-# Copyright 2013, Chef Software, Inc.
+# Copyright:: 2013, 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/apache2/recipes/mod_authz_groupfile.rb
+++ b/cookbooks/apache2/recipes/mod_authz_groupfile.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_groupfile
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_authz_host.rb
+++ b/cookbooks/apache2/recipes/mod_authz_host.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_host
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_authz_owner.rb
+++ b/cookbooks/apache2/recipes/mod_authz_owner.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_owner
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_authz_user.rb
+++ b/cookbooks/apache2/recipes/mod_authz_user.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_authz_user
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_autoindex.rb
+++ b/cookbooks/apache2/recipes/mod_autoindex.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_autoindex
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_buffer.rb
+++ b/cookbooks/apache2/recipes/mod_buffer.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_buffer
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_cache.rb
+++ b/cookbooks/apache2/recipes/mod_cache.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cache
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_cache_disk.rb
+++ b/cookbooks/apache2/recipes/mod_cache_disk.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cache_disk
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_cache_socache.rb
+++ b/cookbooks/apache2/recipes/mod_cache_socache.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cache_socache
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_cern_meta.rb
+++ b/cookbooks/apache2/recipes/mod_cern_meta.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_cern_meta
+#
+# Copyright:: 2016, Alexander van Zoest
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'cern_meta'
--- a/cookbooks/apache2/recipes/mod_cgi.rb
+++ b/cookbooks/apache2/recipes/mod_cgi.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cgi
 #
-# Copyright 2008-2013, Chef Software, Inc.
-# Copyright 2014, Viverae, Inc.
+# Copyright:: 2008-2013, Chef Software, Inc.
+# Copyright:: 2014, Viverae, 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/apache2/recipes/mod_cgid.rb
+++ b/cookbooks/apache2/recipes/mod_cgid.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cgid
 #
-# Copyright 2013, OneHealth Solutions, Inc.
-# Copyright 2014, Viverae, Inc.
+# Copyright:: 2013, OneHealth Solutions, Inc.
+# Copyright:: 2014, Viverae, 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/apache2/recipes/mod_charset_lite.rb
+++ b/cookbooks/apache2/recipes/mod_charset_lite.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_charset_lite
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_cloudflare.rb
+++ b/cookbooks/apache2/recipes/mod_cloudflare.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_cloudflare
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_data.rb
+++ b/cookbooks/apache2/recipes/mod_data.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_data
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_dav.rb
+++ b/cookbooks/apache2/recipes/mod_dav.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dav
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_dav_fs.rb
+++ b/cookbooks/apache2/recipes/mod_dav_fs.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dav_fs
 #
-# Copyright 2011-2013, Atriso
+# Copyright:: 2011-2013, Atriso
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/apache2/recipes/mod_dav_lock.rb
+++ b/cookbooks/apache2/recipes/mod_dav_lock.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dav_lock
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_dav_svn.rb
+++ b/cookbooks/apache2/recipes/mod_dav_svn.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dav_svn
 #
-# Copyright 2008-2009, Chef Software, Inc.
+# Copyright:: 2008-2009, 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,7 @@ include_recipe 'apache2::mod_dav'

 package 'libapache2-svn' do
  case node['platform_family']
-  when 'rhel', 'fedora', 'suse'
+  when 'rhel', 'fedora', 'suse', 'amazon'
    package_name 'mod_dav_svn'
  else
    package_name 'libapache2-svn'
@@ -29,7 +29,7 @@ package 'libapache2-svn' do
 end

 case node['platform_family']
-when 'rhel', 'fedora', 'suse'
+when 'rhel', 'fedora', 'suse', 'amazon'
  file "#{node['apache']['dir']}/conf.d/subversion.conf" do
    action :delete
    backup false
--- a/cookbooks/apache2/recipes/mod_dbd.rb
+++ b/cookbooks/apache2/recipes/mod_dbd.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dbd
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_deflate.rb
+++ b/cookbooks/apache2/recipes/mod_deflate.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_deflate
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_dialup.rb
+++ b/cookbooks/apache2/recipes/mod_dialup.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dialup
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_dir.rb
+++ b/cookbooks/apache2/recipes/mod_dir.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dir
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_dump_io.rb
+++ b/cookbooks/apache2/recipes/mod_dump_io.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_dump_io
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_echo.rb
+++ b/cookbooks/apache2/recipes/mod_echo.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_echo
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_env.rb
+++ b/cookbooks/apache2/recipes/mod_env.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_env
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_expires.rb
+++ b/cookbooks/apache2/recipes/mod_expires.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_expires
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_ext_filter.rb
+++ b/cookbooks/apache2/recipes/mod_ext_filter.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_ext_filter
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_fastcgi.rb
+++ b/cookbooks/apache2/recipes/mod_fastcgi.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_fastcgi
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -17,37 +17,35 @@
 # limitations under the License.
 #

-if platform_family?('debian')
-  if node['apache']['mod_fastcgi']['install_method'] == 'source'
+if node['apache']['mod_fastcgi']['install_method'] == 'package'
+  package node['apache']['mod_fastcgi']['package']
+else
+  if platform_family?('debian')
    package 'build-essential'
    package node['apache']['devel_package']
-  else
-    package 'libapache2-mod-fastcgi'
-  end
-elsif platform_family?('rhel')
-  %W(gcc make libtool #{node['apache']['devel_package']} apr-devel apr).each do |package|
-    yum_package package do
-      action :upgrade
+  elsif platform_family?('rhel', 'amazon')
+    %W(gcc make libtool #{node['apache']['devel_package']} apr-devel apr).each do |package|
+      package package do
+        action :upgrade
+      end
    end
  end
-end

-if platform_family?('rhel') || (platform_family?('debian') && node['apache']['mod_fastcgi']['install_method'] == 'source')
-  src_filepath  = "#{Chef::Config['file_cache_path']}/fastcgi.tar.gz"
+  src_filepath = "#{Chef::Config['file_cache_path']}/fastcgi.tar.gz"
  remote_file 'download fastcgi source' do
    source node['apache']['mod_fastcgi']['download_url']
    path src_filepath
    backup false
  end

-  if platform_family?('debian')
-    top_dir = node['apache']['build_dir']
-  else
-    top_dir = node['apache']['lib_dir']
-  end
+  top_dir = if platform_family?('debian')
+              node['apache']['build_dir']
+            else
+              node['apache']['lib_dir']
+            end
  include_recipe 'apache2::default'
  bash 'compile fastcgi source' do
-    notifies :run, 'execute[generate-module-list]', :immediately if platform_family?('rhel')
+    notifies :run, 'execute[generate-module-list]', :immediately if platform_family?('rhel', 'amazon')
    not_if "test -f #{node['apache']['dir']}/mods-available/fastcgi.conf"
    cwd ::File.dirname(src_filepath)
    code <<-EOH
--- a/cookbooks/apache2/recipes/mod_fcgid.rb
+++ b/cookbooks/apache2/recipes/mod_fcgid.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_fcgid
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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,22 +19,34 @@

 if platform_family?('debian')
  package 'libapache2-mod-fcgid'
-elsif platform_family?('rhel', 'fedora')
+elsif platform_family?('rhel', 'fedora', 'amazon')
  package 'mod_fcgid' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end

  file "#{node['apache']['dir']}/conf.d/fcgid.conf" do
-    action :delete
-    backup false
+    content '# conf is under mods-available/fcgid.conf - apache2 cookbook\n'
+    only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
  end

-  directory '/var/run/httpd/mod_fcgid' do
-    owner node['apache']['user']
-    group node['apache']['group']
-    recursive true
-    only_if { node['platform_version'].to_i >= 6 }
+  # CentOS 7 (and recent Fedoras) have Apache 2.4, where FCGI socket path
+  # and shared memory path is managed adequately without further involvment
+  # neccessary (subdirectory is created under /var/run/httpd).
+  #
+  # However, when the path is specified manually, that subdirectory is NOT
+  # created automatically if it doesn't already exist and Apache fails to
+  # start. Since in recent RHEL systems /var/run is on tmpfs, end result is
+  # that chef-created subdirectory disappears on shutdown, and Apache fails
+  # to start after server reboot. Best to leave out these two settings
+  # unset then.
+  if (node['platform_family'] == 'rhel') && (node['platform_version'].to_i == 6)
+    directory '/var/run/httpd/mod_fcgid' do
+      owner node['apache']['user']
+      group node['apache']['group']
+      recursive true
+    end
  end
+
 elsif platform_family?('suse')
  apache_lib_path = node['apache']['lib_dir']

--- a/cookbooks/apache2/recipes/mod_file_cache.rb
+++ b/cookbooks/apache2/recipes/mod_file_cache.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_file_cache
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_filter.rb
+++ b/cookbooks/apache2/recipes/mod_filter.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_filter
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_headers.rb
+++ b/cookbooks/apache2/recipes/mod_headers.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_headers
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -17,4 +17,6 @@
 # limitations under the License.
 #

-apache_module 'headers'
+apache_module 'headers' do
+  restart true
+end
--- a/cookbooks/apache2/recipes/mod_heartbeat.rb
+++ b/cookbooks/apache2/recipes/mod_heartbeat.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_heartbeat
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_heartmonitor.rb
+++ b/cookbooks/apache2/recipes/mod_heartmonitor.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_heartmonitor
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_http2.rb
+++ b/cookbooks/apache2/recipes/mod_http2.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_http2
+#
+# Copyright:: 2016, Alexander van Zoest
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'http2'
--- a/cookbooks/apache2/recipes/mod_ident.rb
+++ b/cookbooks/apache2/recipes/mod_ident.rb
@@ -0,0 +1,20 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_ident
+#
+# Copyright:: 2016, Alexander van Zoest
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'ident'
--- a/cookbooks/apache2/recipes/mod_include.rb
+++ b/cookbooks/apache2/recipes/mod_include.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_include
 #
-# Copyright 2012-2013, Chef Software, Inc.
+# Copyright:: 2012-2013, 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/apache2/recipes/mod_info.rb
+++ b/cookbooks/apache2/recipes/mod_info.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_info
 #
-# Copyright 2013, Chef Software, Inc.
+# Copyright:: 2013, 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/apache2/recipes/mod_jk.rb
+++ b/cookbooks/apache2/recipes/mod_jk.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: jk
 #
-# Copyright 2013, Mike Babineau <michael.babineau@gmail.com>
-# Copyright 2013, Chef Software, Inc.
+# Copyright:: 2013, Mike Babineau <michael.babineau@gmail.com>
+# Copyright:: 2013, 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 @@

 package 'libapache2-mod-jk' do
  case node['platform_family']
-  when 'rhel', 'fedora', 'suse'
+  when 'rhel', 'fedora', 'suse', 'amazon'
    package_name 'mod_jk'
  else
    package_name 'libapache2-mod-jk'
--- a/cookbooks/apache2/recipes/mod_lbmethod_bybusyness.rb
+++ b/cookbooks/apache2/recipes/mod_lbmethod_bybusyness.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_lbmethod_bybusyness
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_lbmethod_byrequests.rb
+++ b/cookbooks/apache2/recipes/mod_lbmethod_byrequests.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_lbmethod_byrequests
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_lbmethod_bytraffic.rb
+++ b/cookbooks/apache2/recipes/mod_lbmethod_bytraffic.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_lbmethod_bytraffic
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_lbmethod_heartbeat.rb
+++ b/cookbooks/apache2/recipes/mod_lbmethod_heartbeat.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_lbmethod_heartbeat
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_ldap.rb
+++ b/cookbooks/apache2/recipes/mod_ldap.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_ldap
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -17,6 +17,10 @@
 # limitations under the License.
 #

+if platform_family?('rhel', 'amazon') && node['apache']['version'] == '2.4'
+  package 'mod_ldap'
+end
+
 apache_module 'ldap' do
  conf true
 end
--- a/cookbooks/apache2/recipes/mod_log_config.rb
+++ b/cookbooks/apache2/recipes/mod_log_config.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_log_config
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -17,7 +17,7 @@
 # limitations under the License.
 #

-if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd')
+if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd', 'amazon')
  apache_module 'log_config'
 else
  include_recipe 'apache2::default'
--- a/cookbooks/apache2/recipes/mod_log_debug.rb
+++ b/cookbooks/apache2/recipes/mod_log_debug.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_log_debug
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_log_forensic.rb
+++ b/cookbooks/apache2/recipes/mod_log_forensic.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_log_forensic
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_logio.rb
+++ b/cookbooks/apache2/recipes/mod_logio.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_logio
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -17,7 +17,7 @@
 # limitations under the License.
 #

-if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd')
+if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd', 'amazon')
  apache_module 'logio'
 else
  include_recipe 'apache2::default'
--- a/cookbooks/apache2/recipes/mod_lua.rb
+++ b/cookbooks/apache2/recipes/mod_lua.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_lua
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_macro.rb
+++ b/cookbooks/apache2/recipes/mod_macro.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_macro
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_mime.rb
+++ b/cookbooks/apache2/recipes/mod_mime.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_mime
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_mime_magic.rb
+++ b/cookbooks/apache2/recipes/mod_mime_magic.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_mime_magic
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_negotiation.rb
+++ b/cookbooks/apache2/recipes/mod_negotiation.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_negotiation
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_pagespeed.rb
+++ b/cookbooks/apache2/recipes/mod_pagespeed.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_pagespeed
 #
-# Copyright 2013, ZOZI
+# Copyright:: 2013, ZOZI
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/apache2/recipes/mod_perl.rb
+++ b/cookbooks/apache2/recipes/mod_perl.rb
@@ -1,10 +1,10 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_perl
 #
 # adapted from the mod_python recipe by Jeremy Bingham
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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,16 +21,22 @@

 case node['platform_family']
 when 'debian'
-  %w(libapache2-mod-perl2 libapache2-request-perl apache2-mpm-prefork).each do |pkg|
+  %w(libapache2-mod-perl2 libapache2-request-perl).each do |pkg|
    package pkg
  end
+  if node['platform'] == 'ubuntu' && node['platform_version'].to_f <= 14.04
+    package 'apache2-mpm-prefork'
+  end
+  if node['platform'] == 'debian' && node['platform_version'].to_f <= 8
+    package 'apache2-mpm-prefork'
+  end
 when 'suse'
  package 'apache2-mod_perl' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end

  package 'perl-Apache2-Request'
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package 'mod_perl' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end
@@ -46,8 +52,8 @@ when 'freebsd'
 end

 file "#{node['apache']['dir']}/conf.d/perl.conf" do
-  action :delete
-  backup false
+  content '# conf is under mods-available/perl.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end

 apache_module 'perl'
--- a/cookbooks/apache2/recipes/mod_php.rb
+++ b/cookbooks/apache2/recipes/mod_php.rb
@@ -0,0 +1,101 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_php5
+#
+# Copyright:: 2008-2013, Chef Software, Inc.
+# Copyright:: 2014, OneHealth Solutions, Inc.
+# Copyright:: 2014, Viverae, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if node['apache']['mpm'] != 'prefork'
+  Chef::Log.warn('apache2::mod_php generally is expected to be run under a non-threaded MPM, such as prefork')
+  Chef::Log.warn('See http://php.net/manual/en/faq.installation.php#faq.installation.apache2')
+  Chef::Log.warn("Currently the apache2 cookbook is configured to use the '#{node['apache']['mpm']}' MPM")
+end
+
+case node['platform_family']
+when 'debian'
+  if node['platform'] == 'ubuntu' && node['platform_version'].to_f < 16.04
+    package 'libapache2-mod-php5'
+  elsif node['platform'] == 'debian' && node['platform_version'].to_f < 9
+    package 'libapache2-mod-php5'
+  else
+    package 'libapache2-mod-php'
+  end
+when 'arch'
+  package 'php-apache' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+when 'rhel', 'amazon'
+  package 'which'
+  package 'php package' do
+    if node['platform_version'].to_f < 6.0 && node['platform'] != 'amazon'
+      package_name 'php53'
+    else
+      package_name 'php'
+    end
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if 'which php'
+  end
+when 'fedora'
+  package 'which'
+  package 'php' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if 'which php'
+  end
+when 'suse'
+  package 'which'
+  package 'php' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if 'which php'
+  end
+when 'freebsd'
+  %w(php56 libxml2).each do |pkg|
+    package pkg
+  end
+  %w(mod_php56).each do |pkg|
+    package pkg do
+      options '-I'
+    end
+  end
+end unless node['apache']['mod_php']['install_method'] == 'source'
+
+case node['platform_family']
+when 'debian'
+  # on debian plaform_family php creates newly named incompatible config
+  file "#{node['apache']['dir']}/mods-available/php7.0.conf" do
+    content '# conf is under mods-available/php.conf - apache2 cookbook\n'
+  end
+
+  file "#{node['apache']['dir']}/mods-available/php7.0.load" do
+    content '# conf is under mods-available/php.load - apache2 cookbook\n'
+  end
+when 'rhel', 'fedora', 'suse', 'amazon'
+  file "#{node['apache']['dir']}/conf.d/php.conf" do
+    content '# conf is under mods-available/php.conf - apache2 cookbook\n'
+    only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
+  end
+end
+
+template "#{node['apache']['dir']}/mods-available/php.conf" do
+  source 'mods/php.conf.erb'
+  mode '0644'
+  notifies :reload, 'service[apache2]', :delayed
+end
+
+apache_module node['apache']['mod_php']['module_name'] do
+  conf false
+  filename node['apache']['mod_php']['so_filename']
+end
--- a/cookbooks/apache2/recipes/mod_php5.rb
+++ b/cookbooks/apache2/recipes/mod_php5.rb
@@ -1,10 +1,10 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_php5
 #
-# Copyright 2008-2013, Chef Software, Inc.
-# Copyright 2014, OneHealth Solutions, Inc.
-# Copyright 2014, Viverae, Inc.
+# Copyright:: 2008-2013, Chef Software, Inc.
+# Copyright:: 2014, OneHealth Solutions, Inc.
+# Copyright:: 2014, Viverae, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,55 +18,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-if node['apache']['mpm'] != 'prefork'
-  Chef::Log.warn('apache2::mod_php5 generally is expected to be run under a non-threaded MPM, such as prefork')
-  Chef::Log.warn('See http://php.net/manual/en/faq.installation.php#faq.installation.apache2')
-  Chef::Log.warn("Currently the apache2 cookbook is configured to use the '#{node['apache']['mpm']}' MPM")
-end
-
-case node['platform_family']
-when 'debian'
-  package 'libapache2-mod-php5'
-when 'arch'
-  package 'php-apache' do
-    notifies :run, 'execute[generate-module-list]', :immediately
-  end
-when 'rhel'
-  package 'which'
-  package 'php package' do
-    if node['platform_version'].to_f < 6.0
-      package_name 'php53'
-    else
-      package_name 'php'
-    end
-    notifies :run, 'execute[generate-module-list]', :immediately
-    not_if 'which php'
-  end
-when 'fedora'
-  package 'which'
-  package 'php' do
-    notifies :run, 'execute[generate-module-list]', :immediately
-    not_if 'which php'
-  end
-when 'suse'
-  package 'which'
-  package 'php' do
-    notifies :run, 'execute[generate-module-list]', :immediately
-    not_if 'which php'
-  end
-when 'freebsd'
-  %w(php5 mod_php5 libxml2).each do |pkg|
-    package pkg
-  end
-end unless node['apache']['mod_php5']['install_method'] == 'source'
-
-file "#{node['apache']['dir']}/conf.d/php.conf" do
-  action :delete
-  backup false
-end
-
-apache_module 'php5' do
-  conf true
-  filename node['apache']['mod_php5']['so_filename']
-end
+log 'apache2::mod_php5 is deprecated in favor of apache2::mod_php. Please adjust your cookbooks'
+include_recipe 'apache2::mod_php'
--- a/cookbooks/apache2/recipes/mod_privileges.rb
+++ b/cookbooks/apache2/recipes/mod_privileges.rb
@@ -0,0 +1,26 @@
+#
+# Cookbook:: apache2
+# Recipe:: mod_privileges
+#
+# Copyright:: 2016, Alexander van Zoest
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# https://httpd.apache.org/docs/trunk/mod/mod_privileges.html
+# Available in Apache 2.3 and up, on Solaris 10 and OpenSolaris platforms
+if node['apache']['version'] == '2.4' && node['platform_family'] == 'solaris'
+  apache_module 'privileges'
+else
+  log 'Ignoring apache2::mod_privileges. Not available until apache 2.3 and only on Solaris'
+end
--- a/cookbooks/apache2/recipes/mod_proxy.rb
+++ b/cookbooks/apache2/recipes/mod_proxy.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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,4 +19,7 @@

 apache_module 'proxy' do
  conf true
+  if node['platform'] == 'ubuntu' && node['platform_version'].to_f == 12.04
+    restart true
+  end
 end
--- a/cookbooks/apache2/recipes/mod_proxy_ajp.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_ajp.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_ajp
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_proxy_balancer.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_balancer.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_balancer
 #
-# Copyright 2008-2013, Chef Software, Inc.
-# Copyright 2014, OneHealth Solutions, Inc.
+# Copyright:: 2008-2013, Chef Software, Inc.
+# Copyright:: 2014, OneHealth Solutions, 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/apache2/recipes/mod_proxy_connect.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_connect.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_connect
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_proxy_express.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_express.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_express
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_proxy_fcgi.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_fcgi.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_fcgi
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_proxy_fdpass.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_fdpass.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_fdpass
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_proxy_ftp.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_ftp.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_ftp
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_proxy_html.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_html.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_html
 #
-# Copyright 2013, OneHealth Solutions, Inc.
-# Copyright 2015, Alexander van Zoest
+# Copyright:: 2013, OneHealth Solutions, Inc.
+# Copyright:: 2015, Alexander van Zoest
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 # limitations under the License.
 #

-if node['apache']['version'] != '2.4' && platform_family == 'debian'
+if node['apache']['version'] != '2.4' && node['platform_family'] == 'debian'
  package 'libapache2-mod-proxy-html'
 end

--- a/cookbooks/apache2/recipes/mod_proxy_http.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_http.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_http
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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/apache2/recipes/mod_proxy_scgi.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_scgi.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_scgi
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_proxy_wstunnel.rb
+++ b/cookbooks/apache2/recipes/mod_proxy_wstunnel.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_proxy_wstunnel
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_python.rb
+++ b/cookbooks/apache2/recipes/mod_python.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_python
 #
-# Copyright 2008-2013, Chef Software, Inc.
+# Copyright:: 2008-2013, 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.
@@ -24,7 +24,7 @@ when 'suse'
  package 'apache2-mod_python' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end
-when 'rhel', 'fedora'
+when 'rhel', 'fedora', 'amazon'
  package 'mod_python' do
    notifies :run, 'execute[generate-module-list]', :immediately
  end
@@ -37,8 +37,8 @@ when 'freebsd'
 end

 file "#{node['apache']['dir']}/conf.d/python.conf" do
-  action :delete
-  backup false
+  content '# conf is under mods-available/python.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end

 apache_module 'python'
--- a/cookbooks/apache2/recipes/mod_ratelimit.rb
+++ b/cookbooks/apache2/recipes/mod_ratelimit.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_ratelimit
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_reflector.rb
+++ b/cookbooks/apache2/recipes/mod_reflector.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_reflector
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_remoteip.rb
+++ b/cookbooks/apache2/recipes/mod_remoteip.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_remoteip
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, 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/apache2/recipes/mod_reqtimeout.rb
+++ b/cookbooks/apache2/recipes/mod_reqtimeout.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache2
+# Cookbook:: apache2
 # Recipe:: mod_reqtimeout
 #
-# Copyright 2013, OneHealth Solutions, Inc.
+# Copyright:: 2013, OneHealth Solutions, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More