diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-11-08 15:02:29 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-11-08 15:02:29 -0200 |
| commit | 6ec81ea2269bf01d1da3f57f990b09e6194e54f5 (patch) | |
| tree | 2be77252b955419d999e424489ad6d6faccf993f /manifests | |
| parent | 52131ffc1d82a4ce3ef3aa7c764b1e6b900bd2ba (diff) | |
| download | puppet-apache-6ec81ea2269bf01d1da3f57f990b09e6194e54f5.tar.gz puppet-apache-6ec81ea2269bf01d1da3f57f990b09e6194e54f5.tar.bz2 | |
Minor changes
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 077e5e2..a21d881 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -66,20 +66,20 @@ class apache { } # prepare variables to use in templates - case $apache_sites_folder { - '': { $apache_sites_folder = '/var/www/sites' } + case $apache_www_folder { + '': { $apache_www_folder = "/var/www" } } - case $apache_www_folder { - '': { $apache_www_folder = '/var/www' } + case $apache_sites_folder { + '': { $apache_sites_folder = "${apache_www_folder}/sites" } } case $apache_error_folder { - '': { $apache_error_folder = '/var/www/error' } + '': { $apache_error_folder = "${apache_www_folder}/error" } } case $apache_error_dest { - '': { $apache_error_dest = '/var/www/error/index.html' } + '': { $apache_error_dest = "${apache_error_folder}/index.html" } } define site($ensure = present, $docroot = false, $redirect = false, |