diff --git a/manifests/init.pp b/manifests/init.pp index 208147c..d075cac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,7 +7,7 @@ class puppet ( $run_hour = '*/1', $run_minute = '10', $run_if_ipmatch = '') { - $puppet_service = $kernel ? { + $puppet_service = $::kernel ? { 'Darwin' => 'org.macports.puppet', 'FreeBSD' => 'puppetd', 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 $_', # "$fqdn") } - case $kernel { + case $::kernel { 'Linux' : { $puppetpkgs = ['puppet', 'puppet-common'] @@ -61,8 +61,6 @@ class puppet ( true => 'absent', default => $ensure, } - notice("${fqdn} PUPPET-CRON: cron_real: ${cron_real}, daemonize: ${daemonize}, running: ${service_running}" - ) cron { 'puppetrun': command => '/usr/local/sbin/puppetd_run.sh', @@ -79,10 +77,8 @@ class puppet ( alias => 'puppetd_run.sh', ensure => $ensure; '/var/log/puppet': - mode => '0750', - owner => 'puppet', - group => 'puppet'; - } + mode => '0750',owner => 'puppet',group => 'puppet'; +} case $::kernel { 'Darwin' : {