diff options
Diffstat (limited to 'manifests/daemon.pp')
| -rw-r--r-- | manifests/daemon.pp | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 27f3651..13b81b1 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,29 +1,18 @@ # handles puppetd service class puppet::daemon( - $master = false, - $main_master = false, + $master = false, + $main_master = false, + $ensure = hiera('puppet::daemon::ensure', ''), + $port = hiera('puppet::daemon::port', "8140"), + $runinterval = hiera('puppet::daemon::runinterval', "7200"), + $configtimeout = hiera('puppet::daemon::configtimeout', "120"), + $server = hiera('puppet::daemon::server', "puppet.${::domain}" ) { include puppet - case $puppetmaster_port { - '': { $puppetmaster_port = "8140" } - } - - case $puppetd_runinterval { - '': { $puppetd_runinterval = "7200" } - } - - case $puppetd_configtimeout { - '': { $puppetd_configtimeout = "120" } - } - - case $puppetd_server { - '': { $puppetd_server = "puppet.$domain" } - } - - case $puppetd_ensure { + case $ensure { '': { - $puppetd_ensure = $lsbdistcodename ? { + $ensure = $::lsbdistcodename ? { 'squeeze' => '2.7.18-1~bpo60+1', default => installed, } @@ -31,16 +20,16 @@ class puppet::daemon( } package { "puppet-common": - ensure => $puppetd_ensure, + ensure => $ensure, } package { "puppet": - ensure => $puppetd_ensure, + ensure => $ensure, require => Package["cron", "puppet-common"], } file { "/etc/default/puppet": - source => "puppet://$server/modules/puppet/puppet", + source => "puppet:///modules/puppet/puppet", owner => "root", group => "root", mode => 0644, @@ -55,14 +44,14 @@ class puppet::daemon( require => [ Package["puppet"], File["/etc/default/puppet"] ], } - # name of puppet agent section in config file - if $puppetversion <= "0.25.4" { - $puppet_agent_name = 'puppetd' + # Name of puppet agent section in config file + if $::puppetversion <= "0.25.4" { + $agent_name = 'puppetd' } else { - $puppet_agent_name = 'agent' + $agent_name = 'agent' } - # default config file for puppet nodes + # Default config file for puppet nodes if ($master != true) or ($main_master != true) { file { "/etc/puppet/puppet.conf": ensure => file, @@ -78,7 +67,7 @@ class puppet::daemon( } } - # cron rule to restart puppet minutes after puppetmaster is restarted + # Cron rule to restart puppet minutes after puppetmaster is restarted cron { "puppet-restart": command => "/etc/init.d/puppet restart > /dev/null 2>&1", user => root, @@ -105,17 +94,17 @@ class puppet::daemon( ensure => present, } - # thanks to https://labs.riseup.net/code/projects/shared-puppet + # Thanks to https://labs.riseup.net/code/projects/shared-puppet file { "/etc/cron.d/puppetd": - source => "puppet://$server/modules/puppet/cron.d/puppetd", + source => "puppet:///modules/puppet/cron.d/puppetd", owner => root, group => root, mode => 0644; } - # restore to original state after the following bug is addressed: + # Restore to original state after the following bug is addressed: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625626 - if $lsbdistcodename == 'squeeze' { + if $::lsbdistcodename == 'squeeze' { file { "/etc/logrotate.d/puppetmaster": ensure => absent, } |