diff options
| -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", |