2 files changed, 15 insertions, 6 deletions
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'];
+  }
 }