Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet

Conflicts:
	files/master/config.ru
	files/master/puppet.conf
	manifests/base.pp
	manifests/centos.pp
	manifests/cron.pp
	manifests/cron/base.pp
	manifests/cron/linux.pp
	manifests/debian.pp
	manifests/init.pp
	manifests/linux.pp
	manifests/master/linux.pp
	manifests/master/package/debian.pp
	manifests/puppetmaster/base.pp
	manifests/puppetmaster/centos.pp
	manifests/puppetmaster/checklastrun.pp
	manifests/puppetmaster/checklastrun/disable.pp
	manifests/puppetmaster/cleanup_reports.pp
	manifests/puppetmaster/cleanup_reports/disable.pp
	manifests/puppetmaster/debian.pp
	manifests/puppetmaster/package.pp
	manifests/puppetmaster/package/base.pp
	manifests/puppetmaster/passenger.pp

1 files changed, 26 insertions, 0 deletions

diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
new file mode 100644
index 0000000..cf90b1d
--- /dev/null
+++ b/manifests/master/passenger.pp
@@ -0,0 +1,26 @@
+# class to use passenger for serving puppetmaster
+class puppet::master::passenger inherits puppet::master {
+
+  include ::passenger
+
+  # A reference configuration is available at :
+  # http://github.com/reductivelabs/puppet/tree/master/ext/rack
+  file {
+    ['/etc/puppet/rack', '/etc/puppet/rack/public' ]:
+      ensure  => directory,
+      owner   => root,
+      group   => 0,
+      mode    => '0755';
+    '/etc/puppet/rack/tmp':
+      ensure  => directory,
+      owner   => puppet,
+      group   => 0,
+      mode    => '0750';
+    '/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';
+  }
+}