diff options
| author | mh <mh@immerda.ch> | 2009-01-09 01:14:13 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-01-09 01:14:13 +0000 |
| commit | c0725822733b5b5fbf53280fe5b5d727772f290b (patch) | |
| tree | 4a2d6dd7ff194b19c9fb2ef52c17276947c35b47 | |
| parent | f3f463aa19fb268deb1e2c4f9e5705ed8628cfa0 (diff) | |
fixinig naming problem -> Parent classes must have dissimilar names at /srv/puppet/development/modules/git/manifests/web/lighttpd.pp:26
| -rw-r--r-- | manifests/web/lighttpd.pp | 6 | ||||
| -rw-r--r-- | 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", |