From 3decda724d069d976ac92e80b79bbd4ccd5a29de Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 10 Feb 2010 10:41:04 +0100
Subject: with puppet::puppetmaster::passenger, service puppetmaster restarts
 apache2

---
 manifests/puppetmaster/linux.pp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 43cd841..abb7bb8 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -1,10 +1,18 @@
 # manifests/puppetmaster/linux.pp
 
 class puppet::puppetmaster::linux inherits puppet::linux {
+    
+if defined (puppet::puppetmaster::passenger) {
+	$puppetmaster_servicename = "puppetmaster" }
+    else {
+	$puppetmaster_servicename = "apache2"
+        }
+
 
     service{'puppetmaster':
         ensure => running,
-        enable => true,
+        name => $puppetmaster_servicename,
+	enable => true,
         require => [ Package[puppet] ],
     }
 
-- 
cgit v1.2.3