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,
"/",
print ("Can't find user in " ^ #file fs ^ " or " ^ realVhostFile ^ "! Taking no action.\n")
else
let
- val vhostId = if OS.Path.ext (#file spl) = SOME ".vhost_ssl" then
+ val vhostId = if OS.Path.ext (#file spl) = SOME "vhost_ssl" then
OS.Path.base (#file spl) ^ ".ssl"
else
OS.Path.base (#file spl)
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);
| 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);
TextIO.output (file, user))
else
();
- (logDir {user = user, node = node, vhostId = vhostId}, file)
+ (ld, file)
end)
nodes;
write "\n\tDocumentRoot ";