From 06741df4a58188039f14faf8a01bcf753adc8316 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 21 Feb 2017 10:09:12 -0800 Subject: [PATCH 1/2] Remove support for Fedora < 18 These are WAY eol Signed-off-by: Tim Smith --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8f73be9b0..636531bbc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -66,7 +66,7 @@ node['platform_version'].to_f >= 7.0 ? '2.4' : '2.2' end when 'fedora' - node['platform_version'].to_f >= 18 ? '2.4' : '2.2' + '2.4' when 'suse' case node['platform'] when 'suse' From 7a3242a8499cd921046e782ef47e33cbb8825f41 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 21 Feb 2017 10:10:07 -0800 Subject: [PATCH 2/2] Remove support for FreeBSD 9 with Apache 2.2 FreeBSD 9 is EOL. Everyone is on 10+, which is 2.4 Signed-off-by: Tim Smith --- attributes/default.rb | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 636531bbc..812bef68c 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -75,8 +75,6 @@ '2.4' end when 'freebsd' - node['platform_version'].to_f >= 10.0 ? '2.4' : '2.2' - else '2.4' end @@ -213,29 +211,16 @@ default['apache']['lib_dir'] = '/usr/lib/httpd' default['apache']['libexec_dir'] = "#{node['apache']['lib_dir']}/modules" when 'freebsd' - if node['apache']['version'] == '2.4' - default['apache']['package'] = 'apache24' - default['apache']['dir'] = '/usr/local/etc/apache24' - default['apache']['conf_dir'] = '/usr/local/etc/apache24' - default['apache']['docroot_dir'] = '/usr/local/www/apache24/data' - default['apache']['cgibin_dir'] = '/usr/local/www/apache24/cgi-bin' - default['apache']['icondir'] = '/usr/local/www/apache24/icons' - default['apache']['cache_dir'] = '/var/cache/apache24' - default['apache']['run_dir'] = '/var/run' - default['apache']['lock_dir'] = '/var/run' - default['apache']['lib_dir'] = '/usr/local/libexec/apache24' - else - default['apache']['package'] = 'apache22' - default['apache']['dir'] = '/usr/local/etc/apache22' - default['apache']['conf_dir'] = '/usr/local/etc/apache22' - default['apache']['docroot_dir'] = '/usr/local/www/apache22/data' - default['apache']['cgibin_dir'] = '/usr/local/www/apache22/cgi-bin' - default['apache']['icondir'] = '/usr/local/www/apache22/icons' - default['apache']['cache_dir'] = '/var/cache/apache22' - default['apache']['run_dir'] = '/var/run' - default['apache']['lock_dir'] = '/var/run' - default['apache']['lib_dir'] = '/usr/local/libexec/apache22' - end + default['apache']['package'] = 'apache24' + default['apache']['dir'] = '/usr/local/etc/apache24' + default['apache']['conf_dir'] = '/usr/local/etc/apache24' + default['apache']['docroot_dir'] = '/usr/local/www/apache24/data' + default['apache']['cgibin_dir'] = '/usr/local/www/apache24/cgi-bin' + default['apache']['icondir'] = '/usr/local/www/apache24/icons' + default['apache']['cache_dir'] = '/var/cache/apache24' + default['apache']['run_dir'] = '/var/run' + default['apache']['lock_dir'] = '/var/run' + default['apache']['lib_dir'] = '/usr/local/libexec/apache24' default['apache']['devel_package'] = 'httpd-devel' default['apache']['perl_pkg'] = 'perl5' default['apache']['apachectl'] = '/usr/local/sbin/apachectl'