tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated puppet module for OpenBSD 4.7.

Browse source
This commit is contained in:
Ossi Salmi 2010-05-24 16:26:35 +03:00 • committed by Timo Mkinen
parent 7f5d0e07bd
commit 70c8c35ef1
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
puppet/manifests/init.pp
View file

@ -16,14 +16,6 @@ class puppet::client {
} }
} }
package { "puppet":
name => $operatingsystem ? {
openbsd => "ruby-puppet",
default => "puppet",
},
ensure => present,
}
file { "/etc/puppet/puppet.conf": file { "/etc/puppet/puppet.conf":
ensure => present, ensure => present,
content => template("puppet/puppet.conf.erb"), content => template("puppet/puppet.conf.erb"),
@ -33,7 +25,6 @@ class puppet::client {
openbsd => wheel, openbsd => wheel,
default => root default => root
}, },
require => Package["puppet"],
} }
case $operatingsystem { case $operatingsystem {
@ -41,11 +32,15 @@ class puppet::client {
service { "puppet": service { "puppet":
ensure => running, ensure => running,
enable => true, enable => true,
binary => "/usr/local/bin/puppetd", start => $operatingsystemrelease ? {
start => "/usr/local/bin/puppetd", /4\.[1-6]/ => "/usr/local/bin/puppetd",
restart => "/usr/bin/pkill -HUP -f /usr/local/bin/puppetd", default => "/usr/local/sbin/puppetd",
},
restart => $operatingsystemrelease ? {
/4\.[1-6]/ => "/usr/bin/pkill -HUP -f /usr/local/bin/puppetd",
default => "/usr/bin/pkill -HUP -f /usr/local/sbin/puppetd",
},
pattern => puppetd, pattern => puppetd,
require => Package["puppet"],
subscribe => File["/etc/puppet/puppet.conf"], subscribe => File["/etc/puppet/puppet.conf"],
} }
} }
@ -54,7 +49,6 @@ class puppet::client {
ensure => running, ensure => running,
enable => true, enable => true,
restart => "/usr/bin/pkill -HUP puppetd", restart => "/usr/bin/pkill -HUP puppetd",
require => Package["puppet"],
subscribe => File["/etc/puppet/puppet.conf"], subscribe => File["/etc/puppet/puppet.conf"],
} }
} }