Different log directories for different Apache versions

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

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 4ef970b..0a58d57 100644 (file)
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -22,11 +22,14 @@ val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
 
 val public_html = "public_html"
 
 
 val public_html = "public_html"
 

-fun logDirOf user =
+fun logDirOf version1 user =

     if size user < 2 then
        "/bad_username"
     else
     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),
                       String.substring (user, 0, 1),
                       "/",
                       String.substring (user, 0, 2),