Include apache::mod::filter in apache::mod::deflate

This was already done in default mods, but this removes duplication and allows use without default mods.
puppetlabs · Jan 16, 2023 · 210f319 · 210f319
1 parent 176ab02
commit 210f319
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -124,9 +124,6 @@
     include apache::mod::setenvif
     include apache::mod::auth_basic
 
-    # filter is needed by mod_deflate
-    include apache::mod::filter
-
     # authz_core is needed for 'Require' directive
     ::apache::mod { 'authz_core':
       id => 'authz_core_module',
@@ -145,16 +142,10 @@
     ::apache::mod { 'authz_core':
       id => 'authz_core_module',
     }
-
-    # filter is needed by mod_deflate
-    include apache::mod::filter
   } else {
     # authz_core is needed for 'Require' directive
     ::apache::mod { 'authz_core':
       id => 'authz_core_module',
     }
-
-    # filter is needed by mod_deflate
-    include apache::mod::filter
   }
 }
diff --git a/manifests/mod/deflate.pp b/manifests/mod/deflate.pp
@@ -24,6 +24,8 @@
   }
 ) {
   include apache
+  include apache::mod::filter
+
   ::apache::mod { 'deflate': }
 
   file { 'deflate.conf':

diff --git a/spec/classes/mod/deflate_spec.rb b/spec/classes/mod/deflate_spec.rb
@@ -5,6 +5,7 @@
 # This function is called inside the OS specific contexts
 def general_deflate_specs
   it { is_expected.to contain_apache__mod('deflate') }
+  it { is_expected.to contain_class('apache::mod::filter') }
 
   expected = "AddOutputFilterByType DEFLATE application/rss+xml\n"\
   "AddOutputFilterByType DEFLATE application/x-javascript\n"\