summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/cron/openbsd.pp2
-rw-r--r--manifests/openbsd.pp12
2 files changed, 7 insertions, 7 deletions
diff --git a/manifests/cron/openbsd.pp b/manifests/cron/openbsd.pp
index bca3dc6..5575326 100644
--- a/manifests/cron/openbsd.pp
+++ b/manifests/cron/openbsd.pp
@@ -19,7 +19,7 @@ class puppet::cron::openbsd inherits puppet::openbsd {
}
cron { 'puppetd_run':
- command => "/usr/local/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'",
+ command => "/usr/local/sbin/puppet agent --onetime --no-daemonize --config=$puppet_config --color false | grep -E '(^err:|^alert:|^emerg:|^crit:)'",
user => 'root',
minute => split(regsubst($puppet_crontime,'^([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+)$','\1'),','),
hour => split(regsubst($puppet_crontime,'^([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+) ([\d,\-,*,/,\,]+)$','\2'),','),
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',