X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/409542d7ec4496c61140e077e4885e267ab1c184..35659203a708078cdec25ff74adbe1e9168934d6:/configDefault/apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 4ef970b..d7f90c3 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -12,8 +12,8 @@ val undown1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-undown"
 
 val confDir = "/var/domtool/vhosts"
 
-val webNodes_all = [("mire", {version = APACHE_1_3, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
 
 val webNodes_default = ["mire"]
 
@@ -22,11 +22,14 @@ val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 
 val public_html = "public_html"
 
-fun logDirOf user =
+fun logDirOf version1 user =
     if size user < 2 then
 	"/bad_username"
     else
-	String.concat ["/var/log/apache/user/",
+	String.concat [if version1 then
+			   "/var/log/apache/user/"
+		       else
+			   "/var/log/apache2/user/",
 		       String.substring (user, 0, 1),
 		       "/",
 		       String.substring (user, 0, 2),