Automatically include mod_expires if required via vhost directories

Similar to other options passed in the vhost's directory this now inspects the directories entry and if expires_* is passed, mod_expires is included.
puppetlabs · Aug 22, 2024 · d51909d · d51909d
1 parent 6d218cf
commit d51909d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -2362,6 +2362,10 @@
       if 'setenv' in $directory {
         include apache::mod::env
       }
+
+      if 'expires_active' in $directory or 'expires_default' in $directory or 'expires_by_type' in $directory {
+        include apache::mod::expires
+      }
     }
 
     # Template uses:

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -335,6 +335,10 @@
                     }
                   }
                 },
+                {
+                  'path' => '/expires',
+                  'expires_active' => true,
+                },
               ],
               'error_log' => false,
               'error_log_file' => 'httpd_error_log',
@@ -593,6 +597,7 @@
           it { is_expected.to contain_class('apache::mod::authz_groupfile') }
           it { is_expected.to contain_class('apache::mod::auth_gssapi') }
           it { is_expected.to contain_class('apache::mod::env') }
+          it { is_expected.to contain_class('apache::mod::expires') }
           it { is_expected.to contain_class('apache::mod::filter') }
           it { is_expected.to contain_class('apache::mod::headers') }
           it { is_expected.to contain_class('apache::mod::mime') }