puppet: Fixed puppet::client for OpenWRT.
This commit is contained in:
parent
74b91b8380
commit
9ba1c7abf8
1 changed files with 16 additions and 8 deletions
|
@ -25,8 +25,9 @@ class puppet::client {
|
|||
}
|
||||
|
||||
case $::operatingsystem {
|
||||
openbsd: { $vardir = "/var/puppet" }
|
||||
default: { $vardir = "/var/lib/puppet" }
|
||||
"openbsd": { $vardir = "/var/puppet" }
|
||||
"openwrt": { $vardir = "/etc/puppet" }
|
||||
default: { $vardir = "/var/lib/puppet" }
|
||||
}
|
||||
|
||||
case $::operatingsystem {
|
||||
|
@ -140,22 +141,29 @@ class puppet::client {
|
|||
|
||||
file { "/usr/local/sbin/puppet-check":
|
||||
ensure => present,
|
||||
name => $::operatingsystem ? {
|
||||
"openwrt" => "/usr/sbin/puppet-check",
|
||||
default => "/usr/local/sbin/puppet-check",
|
||||
},
|
||||
source => "puppet:///modules/puppet/puppet-check",
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => $::operatingsystem ? {
|
||||
openbsd => "wheel",
|
||||
default => "root",
|
||||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
}
|
||||
cron { "puppet-check":
|
||||
ensure => present,
|
||||
environment => $::operatingsystem ? {
|
||||
openbsd => "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
|
||||
default => undef,
|
||||
"openbsd" => "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
|
||||
default => undef,
|
||||
},
|
||||
command => "/usr/local/sbin/puppet-check",
|
||||
user => root,
|
||||
command => $::operatingsystem ? {
|
||||
"openwrt" => "/usr/sbin/puppet-check",
|
||||
default => "/usr/local/sbin/puppet-check",
|
||||
},
|
||||
user => "root",
|
||||
hour => 5,
|
||||
minute => fqdn_rand(60),
|
||||
require => File["/usr/local/sbin/puppet-check"],
|
||||
|
|
Loading…
Add table
Reference in a new issue