diff options
| author | mh <mh@immerda.ch> | 2009-01-09 01:24:47 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-01-09 01:24:47 +0000 |
| commit | 495657a50f1007f7da9cd4cb9156fe97757b7912 (patch) | |
| tree | 7a25850f88ccf5a61c560011db06a40039b2b2da | |
| parent | 9b19f50186189b4df50a9dd92d9e3298bfba790e (diff) | |
fix import problem
| -rw-r--r-- | manifests/web/lighttpd.pp | 8 | ||||
| -rw-r--r-- | manifests/web/lighttpd/base.pp | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/manifests/web/lighttpd.pp b/manifests/web/lighttpd.pp index b6dfee5..b2d29e1 100644 --- a/manifests/web/lighttpd.pp +++ b/manifests/web/lighttpd.pp @@ -1,4 +1,10 @@ -import 'lighttpd/base.pp' +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", + "puppet://$server/git/web/lighttpd.conf" ], + } +} class git::web::lighttpd { include lighttpd include lighttpd::base::git::web diff --git a/manifests/web/lighttpd/base.pp b/manifests/web/lighttpd/base.pp deleted file mode 100644 index 43ad48f..0000000 --- a/manifests/web/lighttpd/base.pp +++ /dev/null @@ -1,7 +0,0 @@ -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", - "puppet://$server/git/web/lighttpd.conf" ], - } -} |