From 7c6cea1344870d3eed67daba5b123906dfca284a Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Thu, 27 Sep 2012 21:45:41 +0000
Subject: don't install apache-conf on Mageia 2

---
 modules/apache/manifests/base.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index e94c596b..c9bb2792 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -10,7 +10,9 @@ class apache::base {
         alias => 'apache',
     }
 
-    package { 'apache-conf': }
+    if ($lsbdistrelease == '1') or ($lsbdistrelease == '2010.0') {
+	package { 'apache-conf': }
+    }
 
     service { 'httpd':
         alias     => 'apache',
-- 
cgit v1.2.1