Bad dependency to .load files in apache::mod

Fixes error "expected that the catalogue would include File[/etc/apache2/mods-available/proxy_html.load]" Add compilation specs
xbezdick · Mar 11, 2014 · 5960089 · 5960089
1 parent df5df92
commit 5960089
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/manifests/mod.pp b/manifests/mod.pp
@@ -53,10 +53,10 @@
     # the module gets installed.
     $package_before = $::osfamily ? {
       'freebsd' => [
-        File["${mod_dir}/${mod}.load"],
+        File["${mod}.load"],
         File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
       ],
-      default => File["${mod_dir}/${mod}.load"],
+      default => File["${mod}.load"],
     }
     # $_package may be an array
     package { $_package:

diff --git a/spec/classes/mod/auth_kerb_spec.rb b/spec/classes/mod/auth_kerb_spec.rb
@@ -2,7 +2,7 @@
   let :pre_condition do
     'include apache'
   end
-  context "on a Debian OS" do
+  context "on a Debian OS", :compile do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -14,7 +14,7 @@
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("libapache2-mod-auth-kerb") }
   end
-  context "on a RedHat OS" do
+  context "on a RedHat OS", :compile do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -26,7 +26,7 @@
     it { should contain_apache__mod("auth_kerb") }
     it { should contain_package("mod_auth_kerb") }
   end
-  context "on a FreeBSD OS" do
+  context "on a FreeBSD OS", :compile do
     let :facts do
       {
         :osfamily               => 'FreeBSD',

diff --git a/spec/classes/mod/proxy_html_spec.rb b/spec/classes/mod/proxy_html_spec.rb
@@ -6,7 +6,7 @@
       'include apache::mod::proxy_http',
     ]
   end
-  context "on a Debian OS" do
+  context "on a Debian OS", :compile do
     let :facts do
       {
         :osfamily               => 'Debian',
@@ -18,7 +18,7 @@
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("libapache2-mod-proxy-html") }
   end
-  context "on a RedHat OS" do
+  context "on a RedHat OS", :compile do
     let :facts do
       {
         :osfamily               => 'RedHat',
@@ -30,7 +30,7 @@
     it { should contain_apache__mod('proxy_html') }
     it { should contain_package("mod_proxy_html") }
   end
-  context "on a FreeBSD OS" do
+  context "on a FreeBSD OS", :compile do
     let :facts do
       {
         :osfamily               => 'FreeBSD',