From 9ca92ecfefb3bee983b232a826860a07e1d3cc4c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 1 Oct 2008 22:27:30 +0000
Subject: corrected inheritance order

---
 manifests/puppetmaster/cluster.pp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/puppetmaster/cluster.pp b/manifests/puppetmaster/cluster.pp
index 0a1667e..081a290 100644
--- a/manifests/puppetmaster/cluster.pp
+++ b/manifests/puppetmaster/cluster.pp
@@ -1,11 +1,7 @@
 # manifests/puppetmaster/cluster.pp
 
 class puppet::puppetmaster::cluster inherits puppet::puppetmaster {
-    include mongrel, nginx
-
-    File[puppet_config] {
-        require +> [ Package[mongrel], Package[nginx], File[nginx_config] ],
-    }
+    include puppet::puppetmaster::cluster::base
 
     case $operatingsystem {
         gentoo, centos: {
@@ -16,3 +12,11 @@ class puppet::puppetmaster::cluster inherits puppet::puppetmaster {
         }
     }
 }
+
+class puppet::puppetmaster::cluster::base inherits puppet::puppetmaster::base {
+    include mongrel, nginx
+
+    File[puppet_config] {
+        require +> [ Package[mongrel], Package[nginx], File[nginx_config] ],
+    }
+}
-- 
cgit v1.2.3