Proper calculation of different log files for different hosts

[hcoop/domtool2.git] / src / plugins / apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 31fda50..1bb622b 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 (isVersion1 node) user,
                   "/",
                   node,
                   "/",
@@ -404,6 +404,8 @@ val () = Env.containerV_one "vhost"
                                       let
                                           val file = Domain.domainFile {node = node,
                                                                         name = confFile}
+
+                                          val ld = logDir {user = user, node = node, vhostId = vhostId}
                                       in
                                           TextIO.output (file, "# Owner: ");
                                           TextIO.output (file, user);
@@ -415,9 +417,9 @@ val () = Env.containerV_one "vhost"
                                                                  | NONE => "80");
                                           TextIO.output (file, ">\n");
                                           TextIO.output (file, "\tErrorLog ");
-                                          TextIO.output (file, logDir {user = user, node = node, vhostId = vhostId});
+                                          TextIO.output (file, ld);
                                           TextIO.output (file, "/error.log\n\tCustomLog ");
-                                          TextIO.output (file, logDir {user = user, node = node, vhostId = vhostId});
+                                          TextIO.output (file, ld);
                                           TextIO.output (file, "/access.log combined\n");
                                           TextIO.output (file, "\tServerName ");
                                           TextIO.output (file, fullHost);
@@ -441,7 +443,7 @@ val () = Env.containerV_one "vhost"
                                                TextIO.output (file, user))
                                           else
                                               ();
-                                          (logDir {user = user, node = node, vhostId = vhostId}, file)
+                                          (ld, file)
                                       end)
                                   nodes;
                 write "\n\tDocumentRoot ";