diff options
author | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
commit | 24e4503906c5ffef236814b003d1fd629989fc40 (patch) | |
tree | 1721fb6c2387d6cab5c6e6aaa9ab937b52c559f3 /manifests/puppetmaster | |
parent | 04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff) | |
parent | ed7d89163385a6eab4423aae7ce8b5d994339a2f (diff) |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/puppetmaster')
-rw-r--r-- | manifests/puppetmaster/base.pp | 11 | ||||
-rw-r--r-- | manifests/puppetmaster/centos.pp | 6 | ||||
-rw-r--r-- | manifests/puppetmaster/cleanup_reports.pp | 4 | ||||
-rw-r--r-- | manifests/puppetmaster/debian.pp | 21 | ||||
-rw-r--r-- | manifests/puppetmaster/linux.pp | 2 | ||||
-rw-r--r-- | manifests/puppetmaster/package.pp | 14 | ||||
-rw-r--r-- | manifests/puppetmaster/package/base.pp | 6 | ||||
-rw-r--r-- | manifests/puppetmaster/package/debian.pp | 15 | ||||
-rw-r--r-- | manifests/puppetmaster/passenger.pp | 2 |
9 files changed, 54 insertions, 27 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index f2d8613..a313ff2 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,15 +1,18 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ - source => [ "puppet:///modules/site-puppet/master/puppet.conf", - "puppet:///modules/puppet/master/puppet.conf" ], + source => [ + "puppet:///modules/site_puppet/master/${fqdn}/puppet.conf", + "puppet:///modules/site_puppet/master/puppet.conf", + "puppet:///modules/puppet/master/puppet.conf", + ], } if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet::default_config_dir}/fileserver.conf" } file { "$puppet_fileserverconfig": - source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf", - "puppet:///modules/site-puppet/master/fileserver.conf", + source => [ "puppet:///modules/site_puppet/master/${fqdn}/fileserver.conf", + "puppet:///modules/site_puppet/master/fileserver.conf", "puppet:///modules/puppet/master/fileserver.conf" ], owner => root, group => puppet, mode => 640; } diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp index 2673a4d..a6f5e23 100644 --- a/manifests/puppetmaster/centos.pp +++ b/manifests/puppetmaster/centos.pp @@ -2,9 +2,9 @@ class puppet::puppetmaster::centos inherits puppet::puppetmaster::package { file { '/etc/sysconfig/puppetmaster': - source => [ "puppet:///modules/site-puppet/sysconfig/${fqdn}/puppetmaster", - "puppet:///modules/site-puppet/sysconfig/${domain}/puppetmaster", - "puppet:///modules/site-puppet/sysconfig/puppetmaster", + source => [ "puppet:///modules/site_puppet/sysconfig/${fqdn}/puppetmaster", + "puppet:///modules/site_puppet/sysconfig/${domain}/puppetmaster", + "puppet:///modules/site_puppet/sysconfig/puppetmaster", "puppet:///modules/puppet/sysconfig/puppetmaster" ], notify => Service[puppetmaster], owner => root, group => 0, mode => 0644; diff --git a/manifests/puppetmaster/cleanup_reports.pp b/manifests/puppetmaster/cleanup_reports.pp index 664bd81..005a4d7 100644 --- a/manifests/puppetmaster/cleanup_reports.pp +++ b/manifests/puppetmaster/cleanup_reports.pp @@ -1,8 +1,8 @@ class puppet::puppetmaster::cleanup_reports { - + case $puppetmaster_reports_dir { '',undef: { $puppetmaster_reports_dir = '/var/lib/puppet/reports' } } # clean up reports older than $puppetmaster_cleanup_reports days file { '/etc/cron.daily/puppet_reports_cleanup.sh': - content => "#!/bin/bash\nfind /var/lib/puppet/reports/ -maxdepth 2 -type f -ctime +${puppetmaster_cleanup_reports} -exec rm {} \\;\n", + content => "#!/bin/bash\nfind ${puppetmaster_reports_dir} -maxdepth 2 -type f -ctime +${puppetmaster_cleanup_reports} -exec rm {} \\;\n", owner => root, group => 0, mode => 0700; } } diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 853a0e6..f440ba3 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,5 +1,8 @@ -class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::debian { + include puppet::puppetmaster::package + include puppet::puppetmaster::linux + if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { @@ -8,14 +11,18 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { } } + if $puppetmaster_mode == 'passenger' { + $puppetmaster_default_nofity = 'Exec[notify_passenger_puppetmaster]' + } + file { '/etc/default/puppetmaster': - source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster", - "puppet:///modules/site-puppet/master/debian/puppetmaster", + source => [ "puppet:///modules/site_puppet/master/debian/${fqdn}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/${domain}/puppetmaster", + "puppet:///modules/site_puppet/master/debian/puppetmaster", "puppet:///modules/puppet/master/debian/puppetmaster" ], - notify => $puppetmaster_mode ? { - 'passenger' => Exec['notify_passenger_puppetmaster'], - default => Service[puppetmaster], + notify => $puppetmaster_default_nofity ? { + '' => Service[puppetmaster], + default => Exec['notify_passenger_puppetmaster'] }, owner => root, group => 0, mode => 0644; } diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp index 7c2e428..39ca544 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -6,7 +6,7 @@ class puppet::puppetmaster::linux inherits puppet::linux { exec { 'notify_passenger_puppetmaster': refreshonly => true, - #command => 'touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && rm /etc/puppet/rack/tmp/restart.txt', + # command => '/usr/bin/touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && /bin/rm /etc/puppet/rack/tmp/restart.txt', command => '/etc/init.d/apache2 reload', } diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp index 145792e..aef3121 100644 --- a/manifests/puppetmaster/package.pp +++ b/manifests/puppetmaster/package.pp @@ -1,9 +1,17 @@ # manifests/puppetmaster/package.pp -class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { +class puppet::puppetmaster::package { case $operatingsystem { - centos: { include puppet::puppetmaster::package::centos } + centos: { + if $puppetmaster_ensure_version { + warn('$puppetmaster_ensure_version is not supported for this operatingsystem') + } + include puppet::puppetmaster::package::centos } debian: { include puppet::puppetmaster::package::debian } - default: { include puppet::puppetmaster::package::base } + default: { + if $puppetmaster_ensure_version { + warn('$puppetmaster_ensure_version is not supported for this operatingsystem') + } + include puppet::puppetmaster::package::base } } } diff --git a/manifests/puppetmaster/package/base.pp b/manifests/puppetmaster/package/base.pp index 363f827..ff8d02a 100644 --- a/manifests/puppetmaster/package/base.pp +++ b/manifests/puppetmaster/package/base.pp @@ -4,7 +4,9 @@ class puppet::puppetmaster::package::base inherits puppet::puppetmaster::package ensure => present, } - Service['puppetmaster']{ - require +> Package['puppetmaster'], + if $puppetmaster_mode != 'passenger' { + Service['puppetmaster']{ + require +> Package['puppetmaster'], + } } } diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp index 21407bb..cea7ac4 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,6 +1,13 @@ -class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::package::debian { - #Package['puppetmaster']{ - # require => Package['puppetmaster-common'] - #} + include puppet::puppetmaster::package::base + + apt::preferences_snippet { + 'puppet_passenger': + package => 'puppet*', + pin => "version $puppetmaster_ensure_version", + priority => 2000, + notify => Exec['refresh_apt'], + before => Package['puppetmaster']; + } } diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp index c4bc062..584a559 100644 --- a/manifests/puppetmaster/passenger.pp +++ b/manifests/puppetmaster/passenger.pp @@ -13,7 +13,7 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base { owner => root, group => 0, mode => 0755; '/etc/puppet/rack/config.ru': - source => [ "puppet:///modules/site-puppet/master/config.ru", + source => [ "puppet:///modules/site_puppet/master/config.ru", "puppet:///modules/puppet/master/config.ru" ], owner => puppet, group => 0, mode => 0644; } |