From 2c96b3c238b35d09a297f540b2c22650ccd01e31 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Mon, 10 Dec 2012 19:54:49 +0000
Subject: apache: use variable to store apache config package

---
 modules/apache/manifests/base.pp | 6 +-----
 modules/apache/manifests/var.pp  | 8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 2232e78e..a986d50a 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -3,11 +3,7 @@ class apache::base {
 
     package { 'apache-mpm-prefork': }
 
-    if ($lsbdistrelease == '1') or ($lsbdistid == 'MandrivaLinux') {
-	package { 'apache-conf': }
-    } else {
-	package { 'apache': }
-    }
+    package { $apache::var::pkg_conf: }
 
     service { 'httpd':
         alias     => 'apache',
diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp
index 636b9bc5..7c3ff188 100644
--- a/modules/apache/manifests/var.pp
+++ b/modules/apache/manifests/var.pp
@@ -4,4 +4,10 @@ class apache::var(
     $httpdlogs_rotate = '24',
     $apache_user = 'apache',
     $apache_group = 'apache'
-) {}
+) {
+    if ($lsbdistrelease == '1') or ($lsbdistid == 'MandrivaLinux') {
+        $pkg_conf = 'apache-conf'
+    } else {
+        $pkg_conf = 'apache'
+    }
+}
-- 
cgit v1.2.1