aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2017-05-26 01:52:59 +0300
committerThomas Backlund <tmb@mageia.org>2017-05-26 01:52:59 +0300
commit1f853be61f8a027621a37f0c0c2a1b64622625ac (patch)
tree211c95af8657847e74ef3bcc121a0636ecaaa2b6
parent13f7c9549e9d7a6af7cd705ab84f49966b308a3a (diff)
downloadpuppet-1f853be61f8a027621a37f0c0c2a1b64622625ac.tar
puppet-1f853be61f8a027621a37f0c0c2a1b64622625ac.tar.gz
puppet-1f853be61f8a027621a37f0c0c2a1b64622625ac.tar.bz2
puppet-1f853be61f8a027621a37f0c0c2a1b64622625ac.tar.xz
puppet-1f853be61f8a027621a37f0c0c2a1b64622625ac.zip
drop temp range check fixes
-rw-r--r--manifests/defaults.pp3
-rw-r--r--modules/apache/manifests/base.pp3
2 files changed, 2 insertions, 4 deletions
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 444c84a3..762cd146 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -30,8 +30,7 @@ Service {
ensure => running,
}
-# (tmb) temp range check to fix puppet chocking
-if (versioncmp($::lsbdistrelease, '2') >= 0) and (versioncmp($::lsbdistrelease, '6') <= 0) {
+if versioncmp($::lsbdistrelease, '2') >= 0 {
Service {
provider => systemd,
}
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 3d2989b3..a24040e3 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -11,8 +11,7 @@ class apache::base {
alias => 'apache-server',
}
- # (tmb) temp range check to fix puppet chocking
- if (versioncmp($::lsbdistrelease, '2') >= 0) and (versioncmp($::lsbdistrelease, '6') <= 0) {
+ if versioncmp($::lsbdistrelease, '2') <= 0 {
$conf_d = '/etc/httpd/conf.d'
# only needed on mga1 and mga2