From 665c450f7113daa54cb02b229a4a71faba73cd5a Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 27 Apr 2014 10:47:31 +0000
Subject: handle new apache name from mga3 up

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

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 92f55c40..a4c2ac2c 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -1,13 +1,21 @@
 class apache::base {
     include apache::var
 
-    package { 'apache-mpm-prefork': }
+    # apache-mpm-prefork is merged from mga3 up
+    $apache_server = $lsbdistrelease ? {
+	/1|2/	=> 'apache-mpm-prefork',
+	default	=> 'apache',
+    }
+
+    package { '$apache_server':
+	alias 'apache-server'
+    }
 
     package { $apache::var::pkg_conf: }
 
     service { 'httpd':
         alias     => 'apache',
-        subscribe => [ Package['apache-mpm-prefork'] ],
+        subscribe => [ Package['apache-server'] ],
     }
 
     exec { 'service httpd configtest':
-- 
cgit v1.2.1