From 65b33409f0da0a5769e9951685c567f990da41d2 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 1 Oct 2008 22:25:38 +0000
Subject: corrected inheritance order

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

diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index fa975ad..7e80792 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -12,6 +12,10 @@ class puppet::puppetmaster inherits puppet {
             }
         }
     }
+    include puppet::puppetmaster::base
+}
+
+class puppet::puppetmaster::base inherits puppet::base {
 
     File[puppet_config]{
         source => [ "puppet://$server/files/puppet/master/puppet.conf",
@@ -44,6 +48,7 @@ class puppet::puppetmaster inherits puppet {
     }
 }
 
+
 define puppet::puppetmaster::hasdb(
     $dbtype = 'mysql',
     $dbname = 'puppet',
-- 
cgit v1.2.3