From 1f853be61f8a027621a37f0c0c2a1b64622625ac Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Fri, 26 May 2017 01:52:59 +0300
Subject: drop temp range check fixes

---
 manifests/defaults.pp            | 3 +--
 modules/apache/manifests/base.pp | 3 +--
 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
-- 
cgit v1.2.1