summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-04-11 18:46:53 -0400
committerMicah Anderson <micah@riseup.net>2012-04-12 15:15:12 -0400
commitd60d201133b907b0d7afeb65787dd8dc444bf653 (patch)
tree20c56470ab5a892137261da3357565f8f3621c56 /manifests
parent648e60b2ef63b42ff827618a3acb9bcef69d01f1 (diff)
implement fix for cron file being put in place even when you do not include puppet::cron.
The module should make sure that the cron file is not there if you aren't using the cron method, otherwise the daemon and the cronjob could both run. Used suggested change from jcharaoui in #3513
Diffstat (limited to 'manifests')
-rw-r--r--manifests/cron/linux.pp1
-rw-r--r--manifests/linux.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index bab9564..5003559 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -16,5 +16,6 @@ class puppet::cron::linux inherits puppet::linux {
source => undef,
content => "#run puppet\n$puppet_crontime root output=\$(/usr/sbin/puppetd --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n",
before => Service['puppet'],
+ ensure => present
}
}
diff --git a/manifests/linux.pp b/manifests/linux.pp
index fcd3936..13788ef 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -19,5 +19,6 @@ class puppet::linux inherits puppet::base {
"puppet:///modules/puppet/cron.d/puppetd.${operatingsystem}",
"puppet:///modules/puppet/cron.d/puppetd" ],
owner => root, group => 0, mode => 0644,
+ ensure => absent
}
}