This commit is contained in:
Udo Waechter
2013-05-28 18:17:47 +02:00
parent 128ac39807
commit 20f48b8e7a

View File

@@ -7,7 +7,7 @@ class puppet (
$run_hour = '*/1', $run_hour = '*/1',
$run_minute = '10', $run_minute = '10',
$run_if_ipmatch = '') { $run_if_ipmatch = '') {
$puppet_service = $kernel ? { $puppet_service = $::kernel ? {
'Darwin' => 'org.macports.puppet', 'Darwin' => 'org.macports.puppet',
'FreeBSD' => 'puppetd', 'FreeBSD' => 'puppetd',
default => 'puppet' default => 'puppet'
@@ -23,7 +23,7 @@ class puppet (
# @@puppet::puppetmaster::privatedir { $fqdn: l_fqdn => generate('/usr/bin/env', 'perl', '-e', '$_=shift;tr/[A-Z]/[a-z]/;print $_', # @@puppet::puppetmaster::privatedir { $fqdn: l_fqdn => generate('/usr/bin/env', 'perl', '-e', '$_=shift;tr/[A-Z]/[a-z]/;print $_',
# "$fqdn") } # "$fqdn") }
case $kernel { case $::kernel {
'Linux' : { 'Linux' : {
$puppetpkgs = ['puppet', 'puppet-common'] $puppetpkgs = ['puppet', 'puppet-common']
@@ -61,8 +61,6 @@ class puppet (
true => 'absent', true => 'absent',
default => $ensure, default => $ensure,
} }
notice("${fqdn} PUPPET-CRON: cron_real: ${cron_real}, daemonize: ${daemonize}, running: ${service_running}"
)
cron { 'puppetrun': cron { 'puppetrun':
command => '/usr/local/sbin/puppetd_run.sh', command => '/usr/local/sbin/puppetd_run.sh',
@@ -79,9 +77,7 @@ class puppet (
alias => 'puppetd_run.sh', alias => 'puppetd_run.sh',
ensure => $ensure; ensure => $ensure;
'/var/log/puppet': '/var/log/puppet':
mode => '0750', mode => '0750',owner => 'puppet',group => 'puppet';
owner => 'puppet',
group => 'puppet';
} }
case $::kernel { case $::kernel {