Merge branch 'master' of ssh://leap.se:4422/puppet_puppet

Conflicts:
	manifests/puppetmaster/passenger.pp

1 files changed, 21 insertions, 8 deletions

diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
index 584a559..9f4d1e8 100644
--- a/manifests/puppetmaster/passenger.pp
+++ b/manifests/puppetmaster/passenger.pp
@@ -7,14 +7,27 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
   # A reference configuration is available at :
   # http://github.com/reductivelabs/puppet/tree/master/ext/rack
 
-  file {
-    ['/etc/puppet/rack', '/etc/puppet/rack/public', '/etc/puppet/rack/tmp']:
-      ensure => directory,
-      owner => root, group => 0, mode => 0755;
+  case $operatingsystem {
+    debian: {
+      package { 'puppetmaster-passenger': ensure => installed }
+      file {
+        '/usr/share/puppet/rack/puppetmasterd/config.ru':
+          source => [ 'puppet:///modules/site-puppet/master/config.ru',
+                      'puppet:///modules/puppet/master/config.ru' ],
+          owner  => puppet, group => 0, mode => '0644';
+      }
+    }
+    default: {
+      file {
+        ['/etc/puppet/rack', '/etc/puppet/rack/public', '/etc/puppet/rack/tmp']:
+          ensure => directory,
+          owner  => root, group => 0, mode => '0755';
 
-    '/etc/puppet/rack/config.ru':
-      source => [ "puppet:///modules/site_puppet/master/config.ru",
-                  "puppet:///modules/puppet/master/config.ru" ],
-      owner => puppet, group => 0, mode => 0644;
+        '/etc/puppet/rack/config.ru':
+          source => [ 'puppet:///modules/site-puppet/master/config.ru',
+                      'puppet:///modules/puppet/master/config.ru' ],
+          owner  => puppet, group => 0, mode => '0644';
+      }
+    }
   }
 }