Remove Apache 2.2 support

Signed-off-by: Tim Smith <tsmith@chef.io>

Author: tas50

.kitchen.yml

@@ -12,7 +12,6 @@ platforms:
   - name: amazonlinux
     driver_config:
       box: mvbcoding/awslinux
-  - name: centos-6.9
   - name: centos-7.3
   - name: debian-7.11
   - name: debian-8.8

README.md

@@ -116,7 +116,6 @@ In order to support the broadest number of platforms, several attributes are det
 
 These are general settings used in recipes and templates. Default values are noted.
 
-- `node['apache']['version']` - Specifing 2.4 triggers apache 2.4 support. If the platform is known during our test to install 2.4 by default, it will be set to 2.4 for you. Otherwise it falls back to 2.2\. This value should be specified as a string.
 - `node['apache']['listen']` - Array of address:port combinations that httpd should listen on. Default is any address and port 80 (`["*:80"]`).
 - `node['apache']['contact']` - Value for ServerAdmin directive. Default "ops@example.com".
 - `node['apache']['timeout']` - Value for the Timeout directive. Default is 300.

attributes/default.rb

@@ -28,28 +28,6 @@
     'prefork'
   end
 
-default['apache']['version'] =
-  case node['platform_family']
-  when 'debian'
-    case node['platform']
-    when 'debian', 'raspbian'
-      node['platform_version'].to_f >= 8.0 ? '2.4' : '2.2'
-    else
-      '2.4'
-    end
-  when 'rhel'
-    case node['platform']
-    when 'amazon' # This is for chef 12 compatibility
-      '2.4'
-    else
-      node['platform_version'].to_f >= 7.0 ? '2.4' : '2.2'
-    end
-  when 'suse'
-    node['platform_version'].to_f >= 12.1 ? '2.4' : '2.2'
-  else
-    '2.4'
-  end
-
 default['apache']['root_group'] = 'root'
 default['apache']['default_site_name'] = 'default'
 
@@ -76,12 +54,7 @@
   default['apache']['conf_dir']    = '/etc/httpd/conf'
   default['apache']['docroot_dir'] = '/var/www/html'
   default['apache']['cgibin_dir']  = '/var/www/cgi-bin'
-  default['apache']['icondir'] =
-    if node['apache']['version'] == '2.4'
-      '/usr/share/httpd/icons'
-    else
-      '/var/www/icons'
-    end
+  default['apache']['icondir']     = '/usr/share/httpd/icons'
   default['apache']['cache_dir']   = '/var/cache/httpd'
   default['apache']['run_dir']     = '/var/run/httpd'
   default['apache']['lock_dir']    = '/var/run/httpd'
@@ -107,12 +80,7 @@
   default['apache']['cache_dir']   = '/var/cache/apache2'
   default['apache']['run_dir']     = '/var/run/httpd'
   default['apache']['lock_dir']    = '/var/run/httpd'
-  default['apache']['pid_file']    =
-    if node['platform_version'].to_f > 11.4
-      '/var/run/httpd.pid'
-    else
-      '/var/run/httpd2.pid'
-    end
+  default['apache']['pid_file']    = '/var/run/httpd2.pid'
   default['apache']['lib_dir']     = node['kernel']['machine'] =~ /^i[36]86$/ ? '/usr/lib/apache2' : '/usr/lib64/apache2'
   default['apache']['libexec_dir'] = node['apache']['lib_dir']
 when 'debian'
@@ -138,14 +106,8 @@
   default['apache']['cache_dir']   = '/var/cache/apache2'
   default['apache']['run_dir']     = '/var/run/apache2'
   default['apache']['lock_dir']    = '/var/lock/apache2'
-  # this should use COOK-3917 to educate the initscript of the pid location
-  if node['apache']['version'] == '2.4'
-    default['apache']['pid_file']    = '/var/run/apache2/apache2.pid'
-    default['apache']['docroot_dir'] = '/var/www/html'
-  else
-    default['apache']['pid_file']    = '/var/run/apache2.pid'
-    default['apache']['docroot_dir'] = '/var/www'
-  end
+  default['apache']['pid_file']    = '/var/run/apache2/apache2.pid'
+  default['apache']['docroot_dir'] = '/var/www/html'
   default['apache']['lib_dir']       = '/usr/lib/apache2'
   default['apache']['build_dir']     = '/usr/share/apache2'
   default['apache']['libexec_dir']   = "#{node['apache']['lib_dir']}/modules"
@@ -301,16 +263,10 @@
   authz_host authz_user autoindex deflate dir env mime negotiation setenvif
 )
 
-%w(log_config logio).each do |log_mod|
+%w(log_config logio unixd).each do |log_mod|
   default['apache']['default_modules'] << log_mod if %w(rhel amazon fedora suse arch freebsd).include?(node['platform_family'])
 end
 
-if node['apache']['version'] == '2.4'
-  %w(unixd).each do |unix_mod|
-    default['apache']['default_modules'] << unix_mod if %w(rhel amazon fedora suse arch freebsd).include?(node['platform_family'])
-  end
-
-  unless node['platform'] == 'amazon' # This is for chef 12 compatibility
-    default['apache']['default_modules'] << 'systemd' if %w(rhel fedora).include?(node['platform_family'])
-  end
+unless node['platform'] == 'amazon' # This is for chef 12 compatibility
+  default['apache']['default_modules'] << 'systemd' if %w(rhel fedora).include?(node['platform_family'])
 end

recipes/default.rb

@@ -176,13 +176,11 @@
   conf_path node['apache']['dir']
 end
 
-if node['apache']['version'] == '2.4'
   if node['apache']['mpm_support'].include?(node['apache']['mpm'])
     include_recipe "apache2::mpm_#{node['apache']['mpm']}"
   else
     Chef::Log.warn("apache2: #{node['apache']['mpm']} module is not supported and must be handled separately!")
   end
-end
 
 node['apache']['default_modules'].each do |mod|
   module_recipe_name = mod =~ /^mod_/ ? mod : "mod_#{mod}"
@@ -200,15 +198,6 @@
 
 service 'apache2' do
   service_name apache_service_name
-  case node['platform_family']
-  when 'rhel'
-    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
-  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

recipes/mod_authn_core.rb

@@ -16,8 +16,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-if node['apache']['version'] == '2.4'
-  apache_module 'authn_core'
-else
-  Chef::Log.info('Ignoring apache2::mod_authn_core. not available until apache 2.4')
-end
+
+apache_module 'authn_core'

recipes/mod_authz_core.rb

@@ -17,8 +17,4 @@
 # limitations under the License.
 #
 
-if node['apache']['version'] == '2.4'
-  apache_module 'authz_core'
-else
-  apache_module 'authz_default'
-end
+apache_module 'authz_core'

recipes/mod_fcgid.rb

@@ -28,25 +28,6 @@
     content '# conf is under mods-available/fcgid.conf - apache2 cookbook\n'
     only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
   end
-
-  # 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']
 

recipes/mod_ldap.rb

@@ -17,9 +17,7 @@
 # limitations under the License.
 #
 
-if platform_family?('rhel', 'fedora', 'amazon') && node['apache']['version'] == '2.4'
-  package 'mod_ldap'
-end
+package 'mod_ldap'
 
 apache_module 'ldap' do
   conf true

recipes/mod_privileges.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-if !platform_family?('freebsd') && node['apache']['version'] == '2.4'
+if !platform_family?('freebsd')
   include_recipe 'apache2::mod_slotmem_shm'
 end