From: Stephen Gran <steve@lobefin.net>
Date: Tue, 21 Jul 2009 08:43:45 +0000 (+0100)
Subject: I have a cunning plan
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=930c30d7e60f474908e27fd12429353ee7c226fa;p=mirror%2Fdsa-puppet.git

I have a cunning plan
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 33672575a..37c98fb0a 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -54,7 +54,7 @@ class debian-org {
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
-             notify  => Exec["puppet restart"];
+             require => Exec["puppet stop"];
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -95,7 +95,7 @@ class debian-org {
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
-   exec { "puppet restart":
+   exec { "puppet stop":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }