summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-04-18 15:14:04 +0200
committervarac <varacanero@zeromail.org>2017-02-23 10:56:21 +0100
commit61b0127cb0357e187a930cba1cc0e1ace149ed55 (patch)
tree0ce69b05aea427d6748aaa443cfe49de327f9eb6 /puppet/modules/site_apache/manifests
parent8b8ddde128d949f041f62dcf26ac65bfcf4b0875 (diff)
[feat] only care for apache >= 2.4
Diffstat (limited to 'puppet/modules/site_apache/manifests')
-rw-r--r--puppet/modules/site_apache/manifests/common.pp16
1 files changed, 4 insertions, 12 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