summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_apache/manifests/common.pp16
-rw-r--r--puppet/modules/site_nagios/manifests/server/apache.pp5
2 files changed, 5 insertions, 16 deletions
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index 4847cbe3..74116575 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -13,18 +13,10 @@ class site_apache::common {
# needed for the mod_ssl config
include apache::module::mime
- # load mods depending on apache version
- if ( $::lsbdistcodename == 'jessie' ) {
- # apache >= 2.4, debian jessie
- # needed for mod_ssl config
- include apache::module::socache_shmcb
- # generally needed
- include apache::module::mpm_prefork
- } else {
- # apache < 2.4, debian wheezy
- # for "Order" directive, i.e. main apache2.conf
- include apache::module::authz_host
- }
+ # needed for mod_ssl config
+ include apache::module::socache_shmcb
+ # generally needed
+ include apache::module::mpm_prefork
include site_apache::common::tls
include site_apache::common::acme
diff --git a/puppet/modules/site_nagios/manifests/server/apache.pp b/puppet/modules/site_nagios/manifests/server/apache.pp
index 82962e89..98d38122 100644
--- a/puppet/modules/site_nagios/manifests/server/apache.pp
+++ b/puppet/modules/site_nagios/manifests/server/apache.pp
@@ -17,9 +17,6 @@ class site_nagios::server::apache {
include apache::module::php5
include apache::module::cgi
- # apache >= 2.4, debian jessie
- if ( $::lsbdistcodename == 'jessie' ) {
- include apache::module::authn_core
- }
+ include apache::module::authn_core
}