Merge remote-tracking branch 'riseup/master'

Conflicts:
	manifests/puppetmaster/debian.pp
	manifests/puppetmaster/linux.pp
	manifests/puppetmaster/package/debian.pp

1 files changed, 11 insertions, 4 deletions

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'];
+  }
 }