X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=6777085c51f6f87e7f4e4d73774964500c070a8e;hb=9e7faeb499d6d25e7b021958ece4c6b7855aedaf;hp=37c98fb0adf67fa4b14431ea8126a9532d29b919;hpb=930c30d7e60f474908e27fd12429353ee7c226fa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 37c98fb0a..6777085c5 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -50,11 +50,11 @@ class debian-org {
              source => "puppet:///files/etc/timezone",
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
-             source => "puppet:///files/etc/puppet/puppet.conf",
-             notify  => Exec["puppet reload"];
+             source => "puppet:///files/etc/puppet/puppet.conf"
+             ;
       "/etc/default/puppet":
-             source => "puppet:///files/etc/default/puppet",
-             require => Exec["puppet stop"];
+             source => "puppet:///files/etc/default/puppet"
+             ;
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -87,18 +87,6 @@ class debian-org {
         default: {}
    }
 
-   exec { "puppet reload":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "puppetmaster restart":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "puppet stop":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
    exec { "syslog-ng reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
@@ -112,6 +100,10 @@ class debian-org {
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true
    }
+   exec { "puppetmaster restart":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
 }
 
 class debian-proliant inherits debian-org {