diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-17 11:23:52 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-17 11:23:52 +0000 |
| commit | 0b33f4ab9d6e92db8919f631e86af9b454977ff8 (patch) | |
| tree | ca5f710a5e23ef47b2ccae5df55120c3ba1cd14e /modules/bcd/manifests | |
| parent | 3df6fa7b75e7ab898136119222f1503fcc26571d (diff) | |
| download | puppet-0b33f4ab9d6e92db8919f631e86af9b454977ff8.tar puppet-0b33f4ab9d6e92db8919f631e86af9b454977ff8.tar.gz puppet-0b33f4ab9d6e92db8919f631e86af9b454977ff8.tar.bz2 puppet-0b33f4ab9d6e92db8919f631e86af9b454977ff8.tar.xz puppet-0b33f4ab9d6e92db8919f631e86af9b454977ff8.zip | |
fix variable usage
Diffstat (limited to 'modules/bcd/manifests')
| -rw-r--r-- | modules/bcd/manifests/web.pp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/bcd/manifests/web.pp b/modules/bcd/manifests/web.pp index b7fb125a..128af5ea 100644 --- a/modules/bcd/manifests/web.pp +++ b/modules/bcd/manifests/web.pp @@ -1,16 +1,15 @@ class bcd::web { include bcd::base - # TODO simplify this - $bcd_home = $bcd::home + $location = "$bcd::home/public_html" apache::vhost_base { "bcd.$::domain": - location => "$bcd_home/public_html", + location => $location, content => template('bcd/vhost_bcd.conf'), } # not sure if that's useful, since the file is public and trivially # bruteforced - file { "$bcd_home/htpasswd": + file { "$bcd::home/htpasswd": content => template('bcd/htpasswd') } } |