summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache/manifests/common.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-11-05 21:13:31 +0100
committervarac <varacanero@zeromail.org>2015-11-17 19:51:11 +0100
commit20dd8f27004a5dac0ad68113f4b8038cb34bc791 (patch)
treeed0251e0b5b24220fb87ccb3baf9edb5e170497f /puppet/modules/site_apache/manifests/common.pp
parent741bf02b5fabbba35b5cd34437b75eade5fe5dc4 (diff)
[bug] [jessie] Load needed modules for apache 2.4
- Related: #6920
Diffstat (limited to 'puppet/modules/site_apache/manifests/common.pp')
-rw-r--r--puppet/modules/site_apache/manifests/common.pp20
1 files changed, 19 insertions, 1 deletions
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index 64beb231..6d63f5e1 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -1,8 +1,26 @@
+# install basic apache modules needed for all services (nagios, webapp)
class site_apache::common {
- include site_apache::module::rewrite
+ include apache::module::rewrite
+ include apache::module::env
class { '::apache': no_default_site => true, ssl => true }
+ # needed for the mod_ssl config
+ include apache::module::mime
+
+ # load mods depending on apache version
+ if ( versioncmp($::apache_version, '2.4') >= 0 ) {
+ # 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
+ }
+
include site_apache::common::tls
}