Using apache_www_folder for sympa otherwise suexec will complain

diff --git a/manifests/web.pp b/manifests/web.pp
index 26e0667cb422b5f44784e9273b617b3bdaa90504..52a19c903a6d6d542a235f7ed206a87ee90b2205 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -23,7 +23,7 @@ class mail::web inherits websites::setup {
 
 class mail::web::sympa inherits websites::setup {
   apache::site { "$sympa_subdomain":
-    docroot => "${apache_sites_folder}/${sympa_subdomain}/site",
+    docroot => "${apache_www_folder}/${sympa_subdomain}",
     source  => true,
   }
 
@@ -41,12 +41,12 @@ class mail::web::sympa inherits websites::setup {
     require => Package["apache2-suexec"],
   }
 
-  file { "${apache_sites_folder}/${sympa_subdomain}/site/wwsympa.fcgi":
+  file { "${apache_www_folder}/${sympa_subdomain}/wwsympa.fcgi":
     ensure  => present,
     owner   => sympa,
     group   => sympa,
     mode    => 0550,
     content => "#!/bin/sh\n/usr/lib/cgi-bin/sympa/wwsympa.fcgi\n",
-    require => File["${apache_sites_folder}/${sympa_subdomain}/site"],
+    require => File["${apache_www_folder}/${sympa_subdomain}"],
   }
 }