diff options
| -rw-r--r-- | files/master/puppet.conf | 4 | ||||
| -rw-r--r-- | manifests/puppetmaster/base.pp | 7 | ||||
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 9 | ||||
| -rw-r--r-- | manifests/puppetmaster/linux.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/package/base.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/package/debian.pp | 33 |
6 files changed, 52 insertions, 13 deletions
diff --git a/files/master/puppet.conf b/files/master/puppet.conf index 6b4b0e9..fcaef0d 100644 --- a/files/master/puppet.conf +++ b/files/master/puppet.conf @@ -42,7 +42,7 @@ [puppetmasterd] reportdir = $logdir/reports autoflush = true - storeconfigs=true + #storeconfigs=true dbadapter=mysql dbserver=localhost dbuser=puppet @@ -63,7 +63,7 @@ # configure environments [development] manifest=$vardir/development/etc/manifests/site.pp - modulepath=$vardir/development/manifests + modulepath=$vardir/development/modules/ templatepath=$vardir/development/templates/ [production] diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index f2d8613..a7dc7a5 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,8 +1,11 @@ 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" } diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 8cee0ea..a7d7f0a 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -8,12 +8,19 @@ 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", "puppet:///modules/puppet/master/debian/puppetmaster" ], - notify => 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 2670203..a5098cd 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -11,8 +11,8 @@ class puppet::puppetmaster::linux inherits puppet::linux { enable => true, require => [ Package[puppet] ], } - } - Service[puppet]{ - require +> Service[puppetmaster], + Service[puppet]{ + require +> Service[puppetmaster], + } } } 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 33d7d5e..01b7f79 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,6 +1,33 @@ -class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base { - Package['puppetmaster']{ - require => Package['puppetmaster-common'] + if !$puppetmaster_ensure_version { + $puppetmaster_ensure_version = 'installed' + case $lsbdistcodename { + wheezy,sid: { + $puppetmaster_common_required = 'puppetmaster-common' + $puppetmaster_common_ensure = $puppetmaster_ensure_version + } + default: { + if (versioncmp($puppetmaster_ensure_version, "2.6.7") >= 0) { + $puppetmaster_common_requred = 'puppetmaster-common' + $puppetmaster_common_ensure = $puppetmaster_ensure_version + } + } + } + } + + Package["puppetmaster"]{ + require => $puppetmaster_common_required ? { + '' => undef, + default => Package["$puppetmaster_common_required"] + }, + ensure => $puppetmaster_ensure_version, + } + + package { "puppetmaster-common": + ensure => $puppetmaster_common_required ? { + '' => absent, + default => $puppetmaster_common_ensure + }, } } |