Minor changes

diff --git a/manifests/init.pp b/manifests/init.pp
index 077e5e2bd6210e487a9874eef756e5f06595bb1b..a21d881329c748c21e39aa020157bd809d9f1fa8 100644 (file)
--- 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,