From fda32171d119d52b371c8e91bb1d9d4d80edff66 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sun, 5 Nov 2006 12:43:37 +0000
Subject: [PATCH] Fix webserver user/group detection for apache2.

---
 debian/changelog       |  3 ++-
 debian/diogenes.config | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03cda1a..2fe51c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diogenes (0.9.20-2) unstable; urgency=low
 
-  * Switch to dbconfig-common for database setup. 
+  * Switch to dbconfig-common for database setup.
+  * Fix webserver user/group detection for apache2.
 
  -- Jeremy Lainé <jeremy.laine@m4x.org>  Sun,  5 Nov 2006 12:03:28 +0100
 
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
-- 
2.1.4