summaryrefslogtreecommitdiff
path: root/manifests/cron/base.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-09-15 22:41:31 +0200
committermh <mh@immerda.ch>2010-09-15 22:41:31 +0200
commitbfe861221f706cc488c8a247b6d494d07d79f465 (patch)
treec96022d2d91ea6de20395f200d1878e6cfc539aa /manifests/cron/base.pp
parent5b3b8d6e027343acd676dcc6393f0281ef354886 (diff)
fix some issues with cron enabling/service disabling
Diffstat (limited to 'manifests/cron/base.pp')
-rw-r--r--manifests/cron/base.pp13
1 files changed, 7 insertions, 6 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index b30b5b3..acef55e 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -18,14 +18,15 @@ class puppet::cron::base inherits puppet::base {
} else {
Service['puppet']{
hasstatus => false,
+ pattern => 'puppetd',
+ }
+ # this works only on < 2.6
+ exec{'stop_puppet':
+ command => 'kill `cat /var/run/puppet/puppetd.pid`',
+ onlyif => 'test -f /var/run/puppet/puppetd.pid',
+ require => Service['puppet'],
}
}
}
}
- # this works only on < 2.6
- exec{'stop_puppet':
- command => 'kill `cat /var/run/puppet/puppetd.pid`',
- onlyif => 'test -f /var/run/puppet/puppetd.pid',
- require => Service['puppet'],
- }
}