updated allow insatll of puppetmaster on squeeze. This addresses the

package diferences.

2 files changed, 23 insertions, 3 deletions

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
+        },
   }
 }