diff options
| -rw-r--r-- | files/master/puppet.conf | 4 | ||||
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 1 | ||||
| -rw-r--r-- | manifests/puppetmaster/package/debian.pp | 25 |
3 files changed, 25 insertions, 5 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/debian.pp b/manifests/puppetmaster/debian.pp index 8cee0ea..810c5a7 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,5 +1,6 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { + if $puppetmaster_mode != 'passenger' { case $lsbdistcodename { squeeze,sid: { diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp index 33d7d5e..4c4f68b 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,6 +1,25 @@ -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 + } + } + + Package["puppetmaster"]{ + require => $puppetmaster_common_required ? { + '' => undef, + default => Package["$puppetmaster_common_required"] + }, + ensure => $puppetmaster_ensure_version, + } + + package { "puppetmaster-common": + ensure => $puppetmaster_common_ensure ? { + '' => absent, + default => $puppetmaster_common_ensure + }, } } |