From 6c0645888f27dd95fb830eace8913187d24dc174 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 27 Apr 2014 12:05:51 +0000
Subject: disable duplicate apache package requests

---
 modules/apache/manifests/base.pp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 9b767231..f72e4aca 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -11,8 +11,11 @@ class apache::base {
 	alias => 'apache-server',
     }
 
-    package { $apache::var::pkg_conf: }
-
+    # only needed on mga1 and mga2
+    if ($::lsbdistrelease == '1') or ($::lsbdistrelease == '2') {
+	package { $apache::var::pkg_conf: }
+    }
+    
     service { 'httpd':
         alias     => 'apache',
         subscribe => [ Package['apache-server'] ],
-- 
cgit v1.2.1