Merge commit 'nadir/master'

1 files changed, 21 insertions, 6 deletions

diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 43cd841..2a71dd4 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -1,13 +1,28 @@
 # manifests/puppetmaster/linux.pp
 
 class puppet::puppetmaster::linux inherits puppet::linux {
-
-    service{'puppetmaster':
-        ensure => running,
-        enable => true,
-        require => [ Package[puppet] ],
+    
+    if defined (puppet::puppetmaster::passenger) {
+	service{'puppetmaster':
+	    ensure => running,
+	    #name => apache2,
+	    #enable => true,
+	    pattern => 'apache2',
+	    hasstatus => true,
+	    start => '/etc/init.d/apache2 start',
+	    stop => '/etc/init.d/apache2 start',
+	    restart => '/etc/init.d/apache2 restart',
+	    status => 'pgrep apache2',
+	    require => [ Package[puppet] ],
+	}
+    }
+    else {
+	service{'puppetmaster':
+	    ensure => running,
+	    enable => true,
+	    require => [ Package[puppet] ],
+	}
     }
-
     Service[puppet]{
         require +> Service[puppetmaster],
     }