Merge pull request #1305 from jasonhancock/bug-el7-module-dir

EL7 uses conf.modules.d directory for modules.

manifests/params.pp

@@ -62,7 +62,10 @@
     $server_root          = '/etc/httpd'
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = "${httpd_dir}/conf.d"
+    $mod_dir              = $::apache::version::distrelease ? {
+      '7'     => "${httpd_dir}/conf.modules.d",
+      default => "${httpd_dir}/conf.d",
+    }
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"
     $vhost_enable_dir     = undef

spec/acceptance/apache_ssl_spec.rb

@@ -1,13 +1,6 @@
 require 'spec_helper_acceptance'
 require_relative './version.rb'
 
-case fact('osfamily')
-when 'RedHat'
-  vhostd = '/etc/httpd/conf.d'
-when 'Debian'
-  vhostd = '/etc/apache2/sites-available'
-end
-
 describe 'apache ssl' do
 
   describe 'ssl parameters' do
@@ -28,7 +21,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhostd}/15-default-ssl.conf") do
+    describe file("#{$vhost_dir}/15-default-ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
@@ -74,7 +67,7 @@ class { 'apache':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{vhostd}/25-test_ssl.conf") do
+    describe file("#{$vhost_dir}/25-test_ssl.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
       it { is_expected.to contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }

spec/acceptance/class_spec.rb

@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache class' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'httpd'
-    service_name = 'httpd'
-  when 'Debian'
-    package_name = 'apache2'
-    service_name = 'apache2'
-  when 'FreeBSD'
-    package_name = 'apache24'
-    service_name = 'apache24'
-  when 'Gentoo'
-    package_name = 'www-servers/apache'
-    service_name = 'apache2'
-  end
-
   context 'default parameters' do
     it 'should work with no errors' do
       pp = <<-EOS
@@ -27,11 +13,11 @@ class { 'apache': }
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe package(package_name) do
+    describe package($package_name) do
       it { is_expected.to be_installed }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
@@ -80,7 +66,7 @@ class { 'apache':
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end

spec/acceptance/default_mods_spec.rb

@@ -1,19 +1,5 @@
 require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  mod_dir     = '/etc/httpd/conf.d'
-  servicename = 'httpd'
-when 'Debian'
-  mod_dir     = '/etc/apache2/mods-available'
-  servicename = 'apache2'
-when 'FreeBSD'
-  mod_dir     = '/usr/local/etc/apache24/Modules'
-  servicename = 'apache24'
-when 'Gentoo'
-  mod_dir     = '/etc/apache2/modules.d'
-  servicename = 'apache2'
-end
+require_relative './version.rb'
 
 describe 'apache::default_mods class' do
   describe 'no default mods' do
@@ -30,7 +16,7 @@ class { 'apache':
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
   end
@@ -56,12 +42,12 @@ class { 'apache':
     end
 
     # Are these the same?
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.not_to be_running }
     end
-    describe "service #{servicename}" do
+    describe "service #{$service_name}" do
       it 'should not be running' do
-        shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
+        shell("pidof #{$service_name}", {:acceptable_exit_codes => 1})
       end
     end
   end
@@ -94,7 +80,7 @@ class { 'apache':
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
   end
@@ -112,11 +98,11 @@ class { 'apache': default_mods => false }
       expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
     end
 
-    describe service(servicename) do
+    describe service($service_name) do
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/zz_auth_basic.load") do
+    describe file("#{$mod_dir}/zz_auth_basic.load") do
       it { is_expected.to be_file }
     end
   end

spec/acceptance/mod_dav_svn_spec.rb

@@ -1,22 +1,17 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::dav_svn class', :unless => (fact('operatingsystem') == 'OracleLinux' and fact('operatingsystemmajrelease') == '7') do
   case fact('osfamily')
   when 'Debian'
-    mod_dir             = '/etc/apache2/mods-available'
-    service_name        = 'apache2'
     if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04' or fact('operatingsystemrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'
     end
   when 'RedHat'
-    mod_dir             = '/etc/httpd/conf.d'
-    service_name        = 'httpd'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   when 'FreeBSD'
-    mod_dir             = '/usr/local/etc/apache24/Modules'
-    service_name        = 'apache24'
     authz_svn_load_file = 'dav_svn_authz_svn.load'
   end
 
@@ -29,12 +24,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/dav_svn.load") do
+    describe file("#{$mod_dir}/dav_svn.load") do
       it { is_expected.to contain "LoadModule dav_svn_module" }
     end
   end
@@ -50,12 +45,12 @@ class { 'apache::mod::dav_svn':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/#{authz_svn_load_file}") do
+    describe file("#{$mod_dir}/#{authz_svn_load_file}") do
       it { is_expected.to contain "LoadModule authz_svn_module" }
     end
   end

spec/acceptance/mod_deflate_spec.rb

@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::deflate class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default deflate config" do
     it 'succeeds in puppeting deflate' do
       pp= <<-EOS
@@ -25,12 +11,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/deflate.conf") do
+    describe file("#{$mod_dir}/deflate.conf") do
       it { is_expected.to contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
       it { is_expected.to contain "AddOutputFilterByType DEFLATE text/css" }
       it { is_expected.to contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }

spec/acceptance/mod_mime_spec.rb

@@ -1,21 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::mime class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default mime config" do
     it 'succeeds in puppeting mime' do
       pp= <<-EOS
@@ -25,12 +11,12 @@ class { 'apache': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/mime.conf") do
+    describe file("#{$mod_dir}/mime.conf") do
       it { is_expected.to contain "AddType application/x-compress .Z" }
       it { is_expected.to contain "AddHandler type-map var\n" }
       it { is_expected.to contain "AddType text/html .shtml\n" }

spec/acceptance/mod_negotiation_spec.rb

@@ -1,25 +1,7 @@
 require 'spec_helper_acceptance'
+require_relative './version.rb'
 
 describe 'apache::mod::negotiation class' do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    vhost_dir    = '/etc/apache2/vhosts.d'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default negotiation config" do
     it 'succeeds in puppeting negotiation' do
       pp= <<-EOS
@@ -29,12 +11,12 @@ class { '::apache::mod::negotiation': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
 ForceLanguagePriority Prefer Fallback" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -51,11 +33,11 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "ForceLanguagePriority Prefer" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end
@@ -72,11 +54,11 @@ class { '::apache::mod::negotiation':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{mod_dir}/negotiation.conf") do
+    describe file("#{$mod_dir}/negotiation.conf") do
       it { should contain "LanguagePriority en es" }
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { should be_enabled }
       it { should be_running }
     end

spec/acceptance/mod_pagespeed_spec.rb

@@ -1,25 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'apache::mod::pagespeed class' do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache24/Vhosts'
-    mod_dir      = '/usr/local/etc/apache24/Modules'
-    service_name = 'apache24'
-  when 'Gentoo'
-    vhost_dir    = '/etc/apache2/vhosts.d'
-    mod_dir      = '/etc/apache2/modules.d'
-    service_name = 'apache2'
-  end
-
   context "default pagespeed config" do
     it 'succeeds in puppeting pagespeed' do
       pp= <<-EOS
@@ -66,12 +47,12 @@ class { 'apache::mod::pagespeed':
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe service(service_name) do
+    describe service($service_name) do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
-    describe file("#{mod_dir}/pagespeed.conf") do
+    describe file("#{$mod_dir}/pagespeed.conf") do
       it { is_expected.to contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
       it { is_expected.to contain "ModPagespeedEnableFilters remove_comments" }
       it { is_expected.to contain "ModPagespeedDisableFilters extend_cache" }