From 90312c8d28ddf8a23bcfa61c5cc3f9a3d5511e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 28 Jul 2011 20:12:26 +0300
Subject: [PATCH] Fixed some depencies with Ubuntu from puppet server bootstrap
 scripts.

---
 puppet/manifests/init.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index a08ed23..198b959 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -184,13 +184,14 @@ class puppet::server::mongrel inherits puppet::client {
             ubuntu  => Exec["stop-puppetmaster"],
             default => undef,
         },
+        before => File["/etc/puppet/puppet.conf"],
     }
 
     exec { "stop-puppetmaster":
-        command     => "service puppetmaster stop ; true",
+        command     => "pkill -u puppet ; true",
         path        => "/bin:/usr/bin:/sbin:/usr/sbin",
         refreshonly => true,
-        before      => File["/etc/puppet/puppet.conf"],
+        before      => File["/etc/default/puppetmaster"],
     }
 
     include ::mongrel