From 735572fac73a710321b2bc469be2cbdf17c46b11 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 28 Nov 2010 13:01:46 -0500 Subject: Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353) --- manifests/openbsd.pp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'manifests/openbsd.pp') diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 1eeaba5..cff727e 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -1,7 +1,9 @@ class puppet::openbsd inherits puppet::base { + File['puppet_config']{ owner => '_puppet' } + Service['puppet']{ restart => '/bin/kill -HUP `/bin/cat /var/run/puppet/agent.pid`', stop => '/bin/kill `/bin/cat /var/run/puppet/agent.pid`', @@ -10,18 +12,21 @@ class puppet::openbsd inherits puppet::base { hasrestart => false, pattern => 'puppet agent', } - openbsd::rc_local{'puppetd': + + openbsd::rc_local { 'puppetd': binary => '/usr/local/bin/puppet agent', } - cron { 'puppetd_check': - 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/agent.pid`; /usr/local/bin/puppet agent', - minute => 0, - hour => 22, - monthday => '*/2', + + cron { + 'puppetd_check': + 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; + + 'puppetd_restart': + 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