From 32abf4998f39058ddc1d0fbb870ee533328faba9 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 20 May 2013 15:07:27 +0200
Subject: follow new naming convention

---
 files/cron.d/puppetd        | 2 +-
 files/cron.d/puppetd.Gentoo | 2 +-
 manifests/cron/linux.pp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd
index 4db734a..1f2c6b5 100644
--- a/files/cron.d/puppetd
+++ b/files/cron.d/puppetd
@@ -1,5 +1,5 @@
 # check if puppet is running
-0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep $(( $(</dev/urandom od -N2 -t u2 -A n) >> 6 )) &&  /etc/init.d/puppet restart > /dev/null)
+0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppet || (sleep $(( $(</dev/urandom od -N2 -t u2 -A n) >> 6 )) &&  /etc/init.d/puppet restart > /dev/null)
 # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
 0 22 * * */2   root   sleep $(( $( </dev/urandom od -N2 -t u2 -A none ) >> 5 )) &&  /etc/init.d/puppet restart > /dev/null
 
diff --git a/files/cron.d/puppetd.Gentoo b/files/cron.d/puppetd.Gentoo
index 2404d68..0d7e6e1 100644
--- a/files/cron.d/puppetd.Gentoo
+++ b/files/cron.d/puppetd.Gentoo
@@ -1,5 +1,5 @@
 # check if puppet is running
-# 0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep $(( $(</dev/urandom od -N2 -t u2 -A n) >> 6 )) && /etc/init.d/puppet restart > /dev/null)
+# 0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppet || ( sleep $(( $(</dev/urandom od -N2 -t u2 -A n) >> 6 )) && /etc/init.d/puppet restart > /dev/null)
 # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
 # 0 22 * * */2   root   sleep $(( $(</dev/urandom od -N2 -t u2 -A n) >> 5 )) &&  /etc/init.d/puppet restart > /dev/null
 
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index f5b0ebb..d0d0e92 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -17,7 +17,7 @@ class puppet::cron::linux inherits puppet::linux {
 
   File['/etc/cron.d/puppetd']{
     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",
+    content => "#run puppet\n${puppet_crontime} root output=\$(/usr/bin/puppet agent --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,
     notify  => Service['cron']
-- 
cgit v1.2.3