aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas <tmb@mageia.org>2017-05-25 13:52:24 +0300
committerThomas <tmb@mageia.org>2017-05-25 13:52:24 +0300
commit747d012f716035e18059c95d0df0e6b32d94b707 (patch)
treebada077f0f5550f3d005c093a34181b0fd2f75a0
parenta15d9c966502a5bb41fd872a172ca1f635e61fa2 (diff)
downloadpuppet-747d012f716035e18059c95d0df0e6b32d94b707.tar
puppet-747d012f716035e18059c95d0df0e6b32d94b707.tar.gz
puppet-747d012f716035e18059c95d0df0e6b32d94b707.tar.bz2
puppet-747d012f716035e18059c95d0df0e6b32d94b707.tar.xz
puppet-747d012f716035e18059c95d0df0e6b32d94b707.zip
temp range check to fix puppet run failing
-rw-r--r--modules/apache/manifests/base.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index a24040e3..3d2989b3 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -11,7 +11,8 @@ class apache::base {
alias => 'apache-server',
}
- if versioncmp($::lsbdistrelease, '2') <= 0 {
+ # (tmb) temp range check to fix puppet chocking
+ if (versioncmp($::lsbdistrelease, '2') >= 0) and (versioncmp($::lsbdistrelease, '6') <= 0) {
$conf_d = '/etc/httpd/conf.d'
# only needed on mga1 and mga2