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

puppet: Fixed puppet::client for OpenWRT.

Browse source
This commit is contained in:
Timo Makinen 2013-11-26 23:16:40 +02:00
parent 74b91b8380
commit 9ba1c7abf8
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
puppet/manifests/init.pp
View file

@ -25,8 +25,9 @@ class puppet::client {
} }
case $::operatingsystem { case $::operatingsystem {
openbsd: { $vardir = "/var/puppet" } "openbsd": { $vardir = "/var/puppet" }
default: { $vardir = "/var/lib/puppet" } "openwrt": { $vardir = "/etc/puppet" }
default: { $vardir = "/var/lib/puppet" }
} }
case $::operatingsystem { case $::operatingsystem {
@ -140,22 +141,29 @@ class puppet::client {
file { "/usr/local/sbin/puppet-check": file { "/usr/local/sbin/puppet-check":
ensure => present, ensure => present,
name => $::operatingsystem ? {
"openwrt" => "/usr/sbin/puppet-check",
default => "/usr/local/sbin/puppet-check",
},
source => "puppet:///modules/puppet/puppet-check", source => "puppet:///modules/puppet/puppet-check",
mode => "0755", mode => "0755",
owner => "root", owner => "root",
group => $::operatingsystem ? { group => $::operatingsystem ? {
openbsd => "wheel", "openbsd" => "wheel",
default => "root", default => "root",
}, },
} }
cron { "puppet-check": cron { "puppet-check":
ensure => present, ensure => present,
environment => $::operatingsystem ? { environment => $::operatingsystem ? {
openbsd => "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin", "openbsd" => "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
default => undef, default => undef,
}, },
command => "/usr/local/sbin/puppet-check", command => $::operatingsystem ? {
user => root, "openwrt" => "/usr/sbin/puppet-check",
default => "/usr/local/sbin/puppet-check",
},
user => "root",
hour => 5, hour => 5,
minute => fqdn_rand(60), minute => fqdn_rand(60),
require => File["/usr/local/sbin/puppet-check"], require => File["/usr/local/sbin/puppet-check"],