New mod_waklog version

[hcoop/domtool2.git] / configDefault / apache.cfg

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 33ca610..053d17a 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,5 +1,7 @@
 structure Apache :> APACHE_CONFIG = struct
 
+open ConfigTypes
+
 val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache"
 val down = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache-down"
 val undown = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache-undown"
@@ -10,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", true)]
-val webNodes_admin = [("deleuze", false)]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
 
 val webNodes_default = ["mire"]
 
@@ -20,4 +22,19 @@ val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 
 val public_html = "public_html"
 
+fun logDirOf version1 user =
+    if size user < 2 then
+       "/bad_username"
+    else
+       String.concat [if version1 then
+                          "/var/log/apache/user/"
+                      else
+                          "/var/log/apache2/user/",
+                      String.substring (user, 0, 1),
+                      "/",
+                      String.substring (user, 0, 2),
+                      "/",
+                      user,
+                      "/apache/log"]
+
 end