Downgrade mysql cookbook for now

It doesn't play well with our current dev server setup

cookbooks/apache2/templates/default/a2disconf.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/a2dismod.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/a2dissite.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/a2enconf.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/a2enmod.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/a2ensite.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!<%= node['platform_family'] == 'freebsd' ? '/usr/local/bin/perl' : '/usr/bin/perl'%> -w
 #
 # a2enmod by Stefan Fritsch <sf@debian.org>
 # Licensed under Apache License 2.0

cookbooks/apache2/templates/default/apache2.conf.erb

@@ -93,9 +93,9 @@ AccessFileName <%= node['apache']['access_file_name'] %>
 #
 <% access_file_name_prefix = node['apache']['access_file_name'][0..2] if !node['apache']['access_file_name'].empty?
    if access_file_name_prefix != '.ht'
-    file_name_prefix = '(' + access_file_name_prefix + '|.ht)'
+    file_name_prefix = '(' + access_file_name_prefix + '|\.ht)'
    else
-    file_name_prefix = '.ht'
+    file_name_prefix = '\.ht'
    end
 %>
 <Files ~ "^<%= file_name_prefix %>">
@@ -147,7 +147,7 @@ ErrorLog <%= node['apache']['log_dir'] %>/<%= node['apache']['error_log'] %>
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
 #
-LogLevel warn
+LogLevel <%= node['apache']['log_level'] %>
 
 # COOK-1021: Dummy LoadModule directive to aid module installations
 #LoadModule dummy_module modules/mod_dummy.so

cookbooks/apache2/templates/default/default-site.conf.erb

@@ -1,3 +1,6 @@
+<% if node['apache']['version'] != '2.4' -%>
+NameVirtualHost *:<%= node['apache']['default_site_port'] %>
+<% end -%>
 <VirtualHost *:<%= node['apache']['default_site_port'] %>>
   ServerAdmin <%= node['apache']['contact'] %>
 
@@ -37,7 +40,7 @@
 
   # Possible values include: debug, info, notice, warn, error, crit,
   # alert, emerg.
-  LogLevel warn
+  LogLevel <%= node['apache']['log_level'] %>
 
   CustomLog <%= node['apache']['log_dir'] %>/<%= node['apache']['access_log'] %> combined
   ServerSignature On
@@ -56,7 +59,7 @@
     <% end -%>
   </Directory>
 
-  <% if %w{ rhel fedora }.include?(node['platform_family']) -%>
+  <% if %w{ rhel fedora amazon }.include?(node['platform_family']) -%>
   #
   # This configuration file enables the default "Welcome"
   # page if there is no default index page present for

cookbooks/apache2/templates/default/mods/fcgid.conf.erb

@@ -3,7 +3,7 @@
   IPCConnectTimeout 20
 </IfModule>
 
-<% if %w[rhel fedora].include?(node['platform_family']) -%>
+<% if (node['platform_family'] == 'rhel') && (node['platform_version'].to_i == 6) -%>
 # Sane place to put sockets and shared memory file
 SocketPath run/mod_fcgid
 SharememPath run/mod_fcgid/fcgid_shm

cookbooks/apache2/templates/default/mods/mpm_prefork.conf.erb

@@ -9,6 +9,7 @@
   StartServers           <%= node['apache']['prefork']['startservers'] %>
   MinSpareServers        <%= node['apache']['prefork']['minspareservers'] %>
   MaxSpareServers        <%= node['apache']['prefork']['maxspareservers'] %>
+  ServerLimit            <%= node['apache']['prefork']['serverlimit'] %>
   MaxRequestWorkers      <%= node['apache']['prefork']['maxrequestworkers'] %>
   MaxConnectionsPerChild <%= node['apache']['prefork']['maxconnectionsperchild'] %>
  <% else -%>

cookbooks/apache2/templates/default/mods/php.conf.erb

@@ -0,0 +1,35 @@
+<FilesMatch ".+\.ph(p[3457]?|t|tml)$">
+  SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch ".+\.phps$">
+  SetHandler application/x-httpd-php-source
+  # Deny access to raw php sources by default
+  # To re-enable it's recommended to enable access to the files
+  # only in specific virtual host or directory
+<% if node['apache']['version'] == '2.4' -%>
+  Require all denied
+<% else -%>
+  Order Deny,Allow
+  Deny from all
+<% end -%>
+</FilesMatch>
+# Deny access to files without filename (e.g. '.php')
+<FilesMatch "^\.ph(p[3457]?|t|tml|ps)$">
+<% if node['apache']['version'] == '2.4' -%>
+  Require all denied
+<% else -%>
+  Order Deny,Allow
+  Deny from all
+<% end -%>
+</FilesMatch>
+
+# Running PHP scripts in user directories is disabled by default
+#
+# To re-enable PHP in user directories comment the following lines
+# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+# prevents .htaccess files from disabling it.
+<IfModule mod_userdir.c>
+  <Directory /home/*/public_html>
+    php_admin_value engine Off
+  </Directory>
+</IfModule>

cookbooks/apache2/templates/default/mods/php5.conf.erb

@@ -1,37 +0,0 @@
-<IfModule mod_php5.c>
-  <FilesMatch ".+\.ph(p[345]?|t|tml)$">
-    SetHandler application/x-httpd-php
-  </FilesMatch>
-  <FilesMatch ".+\.phps$">
-    SetHandler application/x-httpd-php-source
-    # Deny access to raw php sources by default
-    # To re-enable it's recommended to enable access to the files
-    # only in specific virtual host or directory
-<% if node['apache']['version'] == '2.4' -%>
-    Require all denied
-<% else -%>
-    Order Deny,Allow
-    Deny from all
-<% end -%>
-  </FilesMatch>
-  # Deny access to files without filename (e.g. '.php')
-  <FilesMatch "^\.ph(p[345]?|t|tml|ps)$">
-<% if node['apache']['version'] == '2.4' -%>
-    Require all denied
-<% else -%>
-    Order Deny,Allow
-    Deny from all
-<% end -%>
-  </FilesMatch>
-
-  # Running PHP scripts in user directories is disabled by default
-  #
-  # To re-enable PHP in user directories comment the following lines
-  # (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
-  # prevents .htaccess files from disabling it.
-  <IfModule mod_userdir.c>
-    <Directory /home/*/public_html>
-        php_admin_value engine Off
-    </Directory>
-  </IfModule>
-</IfModule>

cookbooks/apache2/templates/default/port_apache.erb

@@ -1,3 +1,3 @@
-<% node['apache']['listen_ports'].each do |port| -%>
+<% node['apache']['listen'].values.map(&:to_a).flatten.uniq do |port| -%>
 -A FWR -p tcp -m tcp --dport <%= port %> -j ACCEPT
 <% end %>

cookbooks/apache2/templates/default/ports.conf.erb

@@ -1,11 +1,6 @@
 # This file was generated by Chef for <%= node['fqdn'] %>.
 # Do NOT modify this file by hand!
 
-<% node['apache']['listen_ports'].map(&:to_i).uniq.each do |port| -%>
-<% node['apache']['listen_addresses'].uniq.each do |address| -%>
-Listen <%= address.length > 0 ? "#{address}:" : '' %><%= port %>
-<% end -%>
-<% if node['apache']['version'] != "2.4" -%>
-NameVirtualHost *:<%= port %>
-<% end -%>
+<% Apache2::Listen.merge_listen_attributes(node).each do |addr| -%>
+Listen <%= addr %>
 <% end -%>

cookbooks/apache2/templates/default/security.conf.erb

@@ -1,16 +1,3 @@
-#
-# Disable access to the entire file system except for the directories that
-# are explicitly allowed later.
-#
-# This currently breaks the configurations that come with some web application
-# Debian packages. It will be made the default for the release after lenny.
-#
-#<Directory />
-#	AllowOverride None
-#	Order Deny,Allow
-#	Deny from all
-#</Directory>
-
 # Changing the following options will not really affect the security of the
 # server, but might make attacks slightly more difficult in some cases.
 

cookbooks/apache2/templates/default/web_app.conf.erb

@@ -1,4 +1,7 @@
-<VirtualHost *:<%= @params[:server_port] || node['apache']['listen_ports'].first %>>
+<% if node['apache']['version'] != '2.4' -%>
+NameVirtualHost *:<%= @params[:server_port] %>
+<% end -%>
+<VirtualHost *:<%= @params[:server_port] %>>
   ServerName <%= @params[:server_name] %>
   <% if @params[:server_aliases] -%>
   ServerAlias <%= @params[:server_aliases].join " " %>