summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-01-06 22:29:53 +0000
committermh <mh@immerda.ch>2009-01-06 22:29:53 +0000
commitea7261d766263af13b881d84390fbf1b217356c2 (patch)
tree712459e145982d57ebc1ed93a64ed8389e181367
parent581fb04cc97743c68bde8407c46caf4e0eddbba5 (diff)
merged with puzzle
-rw-r--r--manifests/cron/linux.pp2
-rw-r--r--manifests/cron/openbsd.pp2
-rw-r--r--manifests/puppetmaster/checklastrun.pp1
3 files changed, 2 insertions, 3 deletions
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index de831c7..be17498 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -7,6 +7,6 @@ class puppet::cron::linux inherits puppet::linux {
File['/etc/cron.d/puppetd.cron']{
source => undef,
content => "# run puppet
-0,30 * * * * root /usr/sbin/puppetd --onetime --no-daemonize --splay true --config=$puppet_config\n",
+0,30 * * * * root /usr/sbin/puppetd --onetime --no-daemonize --splay --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n",
}
}
diff --git a/manifests/cron/openbsd.pp b/manifests/cron/openbsd.pp
index b095e3b..8337e22 100644
--- a/manifests/cron/openbsd.pp
+++ b/manifests/cron/openbsd.pp
@@ -14,7 +14,7 @@ class puppet::cron::openbsd inherits puppet::openbsd {
}
cron { 'puppetd_run':
- command => "/usr/local/bin/puppetd --onetime --no-daemonize --splay true --config=$puppet_config",
+ command => "/usr/local/bin/puppetd --onetime --no-daemonize --splay --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'",
user => 'root',
minute => [0,30],
}
diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
index cbc3822..7686fec 100644
--- a/manifests/puppetmaster/checklastrun.pp
+++ b/manifests/puppetmaster/checklastrun.pp
@@ -1,5 +1,4 @@
class puppet::puppetmaster::checklastrun {
- include ibp::opt::bin
file{'/opt/bin/puppetlast':
source => [ "puppet://$server/files/puppet/master/puppetlast",
"puppet://$server/puppet/master/puppetlast"],