From 6f76fd693e3dc30b066e0fdefd53ce4f551668f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Mon, 18 Nov 2013 23:36:19 +0100
Subject: [PATCH] Fix diogenes.config

---
 debian/diogenes.config | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/diogenes.config b/debian/diogenes.config
index 02e838a..3602dc8 100644
--- a/debian/diogenes.config
+++ b/debian/diogenes.config
@@ -78,7 +78,11 @@ for i in $webservers ; do nbsrv=`expr $nbsrv + 1`; done
 if [ $nbsrv == 1 ]; then
     server=$(echo $webservers | sed 's/,$//')
     config_file=
-    if [ "$server" == "apache2" ] && [ -f /etc/$server/apache2.conf ]; then
+    if [ "$server" == "apache2" ] && [ -f /etc/$server/envvars ]; then
+        envvars_file=/etc/$server/envvars
+        webuser=$(grep "APACHE_RUN_USER=" $envvars_file | sed 's/.*=//')
+        webgroup=$(grep "APACHE_RUN_GROUP=" $envvars_file | sed 's/.*=//')
+    elif [ "$server" == "apache2" ] && [ -f /etc/$server/apache2.conf ]; then
         config_file=/etc/$server/apache2.conf
     elif [ -f /etc/$server/httpd.conf ]; then
         config_file=/etc/$server/httpd.conf
-- 
2.1.4