diff options
Diffstat (limited to 'manifests/master.pp')
| -rw-r--r-- | manifests/master.pp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 54898a0..f81f2b3 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,20 +1,10 @@ # handles puppetmasterd service class puppet::master( - $main = false + $main = false, + $servertype = hiera('puppet::master::servertype', 'passenger'), + $manager_ca = hiera('puppet::master::manage_ca', false) ) { - # Configuration - case $puppetmaster_servertype { - 'mongrel': { - $puppetmaster_servertype = 'mongrel' - $puppetmaster_daemon_opts = '--ssl_client_header=HTTP_X_SSL_SUBJECT' - } - default: { - $puppetmaster_servertype = 'passenger' - $puppetmaster_daemon_opts = '' - } - } - # Use this option if you want puppet to manage the certificates for all # master nodes, useful when using multiple masters as prevents issues such as # http://groups.google.com/group/puppet-users/browse_thread/thread/f24bd7500e9091bd @@ -25,7 +15,7 @@ class puppet::master( # - It doesn't refresh the proxy server (eg. nginx) upon key updates. # # A better approach is to keep certificates at /etc/puppet/ssl (and hence at your puppet repo). - if $puppetmaster_manage_ca == true { + if $manage_ca == true { include puppet::master::ca } @@ -39,20 +29,22 @@ class puppet::master( package { "sqlite3": ensure => installed; "libmysql-ruby": ensure => installed; - "ruby-hiera-puppet": ensure => $lsbdistcodename ? { + "ruby-hiera-puppet": ensure => $::lsbdistcodename ? { 'squeeze' => absent, default => installed, } } - case $puppetmaster_servertype { + case $servertype { 'mongrel': { - $puppetmaster_puppetmasters = hiera('puppet::master::worker_processes', 4) - $puppetmaster_port = hiera('puppet::master::port', '18140') + $daemon_opts = '--ssl_client_header=HTTP_X_SSL_SUBJECT' + $worker_processes = hiera('puppet::master::worker_processes', 4) + $puppetmaster_port = hiera('puppet::master::port', '18140') include puppet::master::mongrel } 'passenger': { + $daemon_opts = '' include puppet::master::passenger } default: { @@ -110,14 +102,14 @@ class puppet::master( } # cron rule to execute puppetlast once a week as a report - # currently not working for puppet 2.6.x + # currently not working for puppet 2.6+ cron { "puppetlast": command => "/usr/local/sbin/puppetlast", user => root, hour => "0", minute => "0", weekday => "0", - ensure => $puppetversion ? { + ensure => $::puppetversion ? { "0.25.4" => present, default => absent, }, |