Fix diogenes.config
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Mon, 18 Nov 2013 22:36:19 +0000 (23:36 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Mon, 18 Nov 2013 22:36:19 +0000 (23:36 +0100)
debian/diogenes.config

index 02e838a..3602dc8 100644 (file)
@@ -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