make web::vhost::rpm compile on EL7 even if we don't use it there

theforeman · Dec 18, 2024 · 913668d · 913668d
1 parent bf329e9
commit 913668d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/puppet/modules/web/manifests/vhost/rpm.pp b/puppet/modules/web/manifests/vhost/rpm.pp
@@ -42,7 +42,12 @@
     script_content => epp('web/deploy-rpmrepo.sh.epp', $deploy_rpmrepo_context),
   }
 
-  include apache::mod::expires
+  # vhosts don't autorequire the expires module
+  # https://github.com/puppetlabs/puppetlabs-apache/pull/2559
+  # limit to not EL7 as there we use apache::default_mods
+  if $facts['os']['family'] != 'RedHat' or $facts['os']['release']['major'] != '7' {
+    include apache::mod::expires
+  }
   include apache::mod::dir
   include apache::mod::autoindex
   include apache::mod::alias

diff --git a/puppet/modules/web/manifests/vhost/stagingrpm.pp b/puppet/modules/web/manifests/vhost/stagingrpm.pp
@@ -28,7 +28,12 @@
     },
   ]
 
-  include apache::mod::expires
+  # vhosts don't autorequire the expires module
+  # https://github.com/puppetlabs/puppetlabs-apache/pull/2559
+  # limit to not EL7 as there we use apache::default_mods
+  if $facts['os']['family'] != 'RedHat' or $facts['os']['release']['major'] != '7' {
+    include apache::mod::expires
+  }
   include apache::mod::dir
   include apache::mod::autoindex
   include apache::mod::alias