Different log directories for different Apache versions

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"
 
-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),

diff --git a/configDefault/apache.csg b/configDefault/apache.csg
index 63adf00..cd0fbb7 100644 (file)
--- a/configDefault/apache.csg
+++ b/configDefault/apache.csg
@@ -18,6 +18,6 @@ signature APACHE_CONFIG = sig
 
     val        public_html : string
 
-    val logDirOf : string -> string
+    val logDirOf : bool -> string -> string
 
 end

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 31fda50..602a396 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -242,7 +242,7 @@ fun undown () = if imVersion1 () then Config.Apache.undown1 else Config.Apache.u
 fun reload () = if imVersion1 () then Config.Apache.reload1 else Config.Apache.reload
 
 fun logDir {user, node, vhostId} =
-    String.concat [Config.Apache.logDirOf user,
+    String.concat [Config.Apache.logDirOf (imVersion1 ()) user,
                   "/",
                   node,
                   "/",