From 61b0127cb0357e187a930cba1cc0e1ace149ed55 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 18 Apr 2016 15:14:04 +0200 Subject: [feat] only care for apache >= 2.4 --- puppet/modules/site_apache/manifests/common.pp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'puppet/modules/site_apache') 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 -- cgit v1.2.3