From 66d3383131ec3a3b992c530bbcc1603cbcd0d9db Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 17 Aug 2010 15:17:26 +0200
Subject: update openbsd stuff to 2.6 style

---
 manifests/openbsd.pp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'manifests/openbsd.pp')

diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index 2b51efc..fbf58e3 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -3,22 +3,22 @@ class puppet::openbsd inherits puppet::base {
     owner => '_puppet'
   }
   Service['puppet']{
-    restart => '/bin/kill -HUP `/bin/cat /var/run/puppet/puppetd.pid`',
-    stop => '/bin/kill `/bin/cat /var/run/puppet/puppetd.pid`',
-    start => '/usr/local/bin/puppetd',
+    restart => '/bin/kill -HUP `/bin/cat /var/run/puppet/agent.pid`',
+    stop => '/bin/kill `/bin/cat /var/run/puppet/agent.pid`',
+    start => '/usr/local/bin/puppet agent',
     hasstatus => false,
     hasrestart => false,
   }
   openbsd::rc_local{'puppetd':
-    binary => '/usr/local/bin/puppetd',
+    binary => '/usr/local/bin/puppet agent',
   }
   cron { 'puppetd_check':
-    command => '/bin/ps ax | /usr/bin/grep -v grep | /usr/bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` && /usr/local/bin/puppetd)',
+    command => '/bin/ps ax | /usr/bin/grep -v grep | /usr/bin/grep -q "puppet agent" || (sleep `echo $RANDOM/2000*60 | bc` && /usr/local/bin/puppet agent)',
     user => root,
     minute => 0,
   }
   cron { 'puppetd_restart':
-    command => 'sleep `echo $RANDOM/2000*60 | bc` && /bin/kill `/bin/cat /var/run/puppet/puppetd.pid`; /usr/local/bin/puppetd',
+    command => 'sleep `echo $RANDOM/2000*60 | bc` && /bin/kill `/bin/cat /var/run/puppet/agent.pid`; /usr/local/bin/puppet agent',
     minute => 0,
     hour => 22,
     monthday => '*/2',
-- 
cgit v1.2.3