From 5c158f06292d8b15cbe08d43ee36b08c30048569 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 12 May 2010 15:56:30 -0400
Subject: adapt puppet::puppetmaster::passenger to updated passenger module

---
 manifests/puppetmaster/passenger.pp | 46 +++++++++++--------------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
index 06e2a2b..636c135 100644
--- a/manifests/puppetmaster/passenger.pp
+++ b/manifests/puppetmaster/passenger.pp
@@ -1,45 +1,27 @@
 # class to use passenger for serving puppetmaster
 
-class puppet::puppetmaster::passenger {
-   
-    case $operatingsystem {
-        debian:    { include puppet::puppetmaster::passenger::debian  }
-        defaults: { notice ( "class puppet::puppetmaster::passenger::base needs to be configured for using passenger with non-debian OS !" )
-		    include  puppet::puppetmaster::passenger::base }    	
-	}
-}
-
-class puppet::puppetmaster::passenger::debian inherits puppet::puppetmaster::passenger::base {
-    # according to http://github.com/reductivelabs/puppet/tree/master/ext/rack rack needs 
-    # to be version >= 1.0.0 . lenny-backports provide it
-    package { "librack-ruby": ensure => "1.0.0-2~bpo50+1" } 
-    package { "librack-ruby1.8": ensure => "1.0.0-2~bpo50+1" } 
-    
-    apache::config::global{ 'puppet-apache2-passenger.conf': }
-    apache::debian::module { 'ssl': ensure    => present }
-    apache::debian::module { 'passenger': ensure    => present }
-    apache::debian::module { 'headers': ensure    => present }
-}
+class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
 
-class puppet::puppetmaster::passenger::base {
-
-    include apache
-    include passenger::apache
-    
+    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"]:
+
+    file { ['/etc/puppet/rack', '/etc/puppet/rack/public']:
       ensure => directory,
-      mode => 0755,
       owner => root,
-      group => root,
+      group => 0,
+      mode => 0755,
     }
+
     file { "/etc/puppet/rack/config.ru":
       ensure => present,
-      source => "puppet:///modules/puppet/master/config.ru",
-      mode => 0644,
+      source => [ "puppet://${server}/modules/site-puppet/master/config.ru",
+                  "puppet://${server}/modules/puppet/master/config.ru",
+                ],
       owner => puppet,
-      group => root,
+      group => 0,
+      mode => 0644,
     }
-}
 
+}
-- 
cgit v1.2.3