From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 25 Aug 2010 02:11:45 +0000 (-0300)
Subject: Using apache_www_folder for sympa otherwise suexec will complain
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d41cc348be192d7902ce93a83e04106e572bf631;p=puppet-mail.git

Using apache_www_folder for sympa otherwise suexec will complain
---

diff --git a/manifests/web.pp b/manifests/web.pp
index 26e0667..52a19c9 100644
--- 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}"],
   }
 }