From 727a94a07332711ecd843bc68d4aa2fe91f2dc7f Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Tue, 17 May 2011 16:44:24 +0000
Subject: [PATCH] On met des valeurs par default pour mpm-itk

---
 etc/alternc/apache2-ssl.conf               | 1 +
 etc/alternc/apache2.conf                   | 3 +++
 etc/alternc/templates/alternc/bureau.conf  | 2 ++
 etc/alternc/templates/apache2/panel.conf   | 1 +
 etc/alternc/templates/apache2/url.conf     | 3 ++-
 etc/alternc/templates/apache2/webmail.conf | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/etc/alternc/apache2-ssl.conf b/etc/alternc/apache2-ssl.conf
index 36645f7a..078a002d 100644
--- a/etc/alternc/apache2-ssl.conf
+++ b/etc/alternc/apache2-ssl.conf
@@ -1,4 +1,5 @@
 <VirtualHost *:443>
+  AssignUserId www-data www-data
 
   Include /etc/alternc/bureau.conf
 
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index ff20e0e6..a803f1de 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -1,6 +1,9 @@
 # This module is loaded in /etc/apache/modules, and enabled by apache-modconf 
 # LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so
 
+# Define the default user and group for mpm-itk
+AssignUserId www-data www-data
+
 ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 
 # Deny access to the root filesystem
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index 4c8d7320..a9f7fe46 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -1,4 +1,6 @@
 
+  AssignUserId www-data www-data
+
   DocumentRoot /var/alternc/bureau/admin
   ServerName %%fqdn%%
   RewriteEngine on
diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf
index 8e367d73..be308957 100644
--- a/etc/alternc/templates/apache2/panel.conf
+++ b/etc/alternc/templates/apache2/panel.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
   DocumentRoot /var/alternc/bureau/admin
+  AssignUserId www-data www-data
   ServerName %%fqdn%%
   RewriteEngine on
   RewriteRule   ^/admin/(.*)  /$1
diff --git a/etc/alternc/templates/apache2/url.conf b/etc/alternc/templates/apache2/url.conf
index ab234c97..f6b57118 100644
--- a/etc/alternc/templates/apache2/url.conf
+++ b/etc/alternc/templates/apache2/url.conf
@@ -1,5 +1,6 @@
-<Virtualhost *:80> 
+Virtualhost *:80> 
   ServerName %%fqdn%%
+  AssignUserId #%%UID%% #%%GID%% 
 
   KeepAlive Off 
 
diff --git a/etc/alternc/templates/apache2/webmail.conf b/etc/alternc/templates/apache2/webmail.conf
index e97810ff..a48d9805 100644
--- a/etc/alternc/templates/apache2/webmail.conf
+++ b/etc/alternc/templates/apache2/webmail.conf
@@ -1,5 +1,7 @@
 <VirtualHost *:80>
   ServerName %%fqdn%%
+  AssignUserId www-data www-data
+
   DocumentRoot /usr/share/squirrelmail
   <Directory /usr/share/squirrelmail>
   #  php_value register_globals On # refer to Debian bug #128226