From c0725822733b5b5fbf53280fe5b5d727772f290b Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 9 Jan 2009 01:14:13 +0000
Subject: fixinig naming problem -> Parent classes must have dissimilar names
 at /srv/puppet/development/modules/git/manifests/web/lighttpd.pp:26

---
 manifests/web/lighttpd.pp      | 6 ++++--
 manifests/web/lighttpd/base.pp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/web/lighttpd.pp b/manifests/web/lighttpd.pp
index 5784244..665b036 100644
--- a/manifests/web/lighttpd.pp
+++ b/manifests/web/lighttpd.pp
@@ -1,5 +1,7 @@
-class git::web::lighttpd inherits lighttpd {
-    include git::web::lighttpd::base
+class git::web::lighttpd {
+    include lighttpd 
+    import 'lighttpd/base.pp'
+    include lighttpd::base::git::web
 
     file{'/etc/lighttpd/lighttpd-gitweb-defaults.conf':
         source => [ "puppet://$server/files/git/web/${fqdn}/lighttpd-gitweb-defaults.conf",
diff --git a/manifests/web/lighttpd/base.pp b/manifests/web/lighttpd/base.pp
index 26fd225..43ad48f 100644
--- a/manifests/web/lighttpd/base.pp
+++ b/manifests/web/lighttpd/base.pp
@@ -1,4 +1,4 @@
-class git::web::lighttpd::base {
+class lighttpd::base::git::web inherits lighttpd::base {
     File['/etc/lighttpd/lighttpd.conf']{
         source => [ "puppet://$server/files/git/web/${fqdn}/lighttpd.conf",
                     "puppet://$server/files/git/web/lighttpd.conf",
-- 
cgit v1.2.3