From dfdb96c1c071b817d9ccc50cd2e4790a36a78ec7 Mon Sep 17 00:00:00 2001 From: nadir Date: Wed, 17 Feb 2010 14:25:28 +0100 Subject: On puppet::puppetmaster::passenger apache2 needs to be restarted instead of puppetmasted --- manifests/puppetmaster/linux.pp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp index abb7bb8..2a71dd4 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -2,20 +2,27 @@ class puppet::puppetmaster::linux inherits puppet::linux { -if defined (puppet::puppetmaster::passenger) { - $puppetmaster_servicename = "puppetmaster" } + 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 { - $puppetmaster_servicename = "apache2" - } - - - service{'puppetmaster': - ensure => running, - name => $puppetmaster_servicename, - enable => true, - require => [ Package[puppet] ], + service{'puppetmaster': + ensure => running, + enable => true, + require => [ Package[puppet] ], + } } - Service[puppet]{ require +> Service[puppetmaster], } -- cgit v1.2.3