summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-11-16 13:46:35 +0100
committervarac <varacanero@zeromail.org>2015-11-17 20:00:50 +0100
commit5e78892e07d94d3d3da8d97fef9d67a15297070d (patch)
tree2ffcba61d24f550d882ee7631f905cd57422ed48
parentd89596c5b8da7345c65c940bb20b52a0910a4acd (diff)
[bug] use $lsbdistcodename to query apache version
Using $::apache_version won't work because the facts are evaluated before compiling the catalog and with this, before the installation of apache. so on an install from scratch, this fact won't contain anything.
-rw-r--r--puppet/modules/site_apache/manifests/common.pp2
-rw-r--r--puppet/modules/site_nagios/manifests/server/apache.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index 6d63f5e1..dadf7ea5 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -10,7 +10,7 @@ class site_apache::common {
include apache::module::mime
# load mods depending on apache version
- if ( versioncmp($::apache_version, '2.4') >= 0 ) {
+ if ( $::lsbdistcodename == 'jessie' ) {
# apache >= 2.4, debian jessie
# needed for mod_ssl config
include apache::module::socache_shmcb
diff --git a/puppet/modules/site_nagios/manifests/server/apache.pp b/puppet/modules/site_nagios/manifests/server/apache.pp
index 7de477cd..82962e89 100644
--- a/puppet/modules/site_nagios/manifests/server/apache.pp
+++ b/puppet/modules/site_nagios/manifests/server/apache.pp
@@ -18,7 +18,7 @@ class site_nagios::server::apache {
include apache::module::cgi
# apache >= 2.4, debian jessie
- if ( versioncmp($::apache_version, '2.4') >= 0 ) {
+ if ( $::lsbdistcodename == 'jessie' ) {
include apache::module::authn_core
}