Different log directories for different Apache versions

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 0000104..0a58d57 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -1,17 +1,40 @@
 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"
+
+val reload1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3"
+val down1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-down"
+val undown1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-undown"
 
 val confDir = "/var/domtool/vhosts"
 
-val webNodes_all = ["mire"]
-val webNodes_admin = ["deleuze"]
+val webNodes_all = [("mire", {version = APACHE_1_3, auth = MOD_WAKLOG})]
+val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
 
 val webNodes_default = ["mire"]
 
 val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
                    "http://hcoop.net/pipermail"]
 
-val public_html = "home/public_html"
+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