X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=debian%2Fdiogenes.config;h=c319a47ca1b83f7cec0bb5578f62223bcce0f46b;hb=fda32171d119d52b371c8e91bb1d9d4d80edff66;hp=6cf127f97e34495a9b49910ad4bdcb167ad5de97;hpb=7e17ed7462e2978bc760a11661a75bae5ab0beb4;p=diogenes.git

diff --git a/debian/diogenes.config b/debian/diogenes.config
index 6cf127f..c319a47 100644
--- a/debian/diogenes.config
+++ b/debian/diogenes.config
@@ -34,10 +34,16 @@ for i in $webservers ; do nbsrv=`expr $nbsrv + 1`; done
 
 if [ $nbsrv == 1 ]; then
     server=$(echo $webservers | sed 's/,$//')
-    if [ -f /etc/$server/httpd.conf ]; then
-        getwwwoption User /etc/$server/httpd.conf
+    config_file=
+    if [ "$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
+    fi
+    if [ -n "$config_file" ]; then
+        getwwwoption User $config_file
         webuser=$(echo "$getwwwoption" | sed -e "q")
-        getwwwoption Group /etc/$server/httpd.conf
+        getwwwoption Group $config_file
         webgroup=$(echo "$getwwwoption" | sed -e "q")
     fi
 fi