val _ = Defaults.registerDefault ("Group",
(TBase "your_group", dl),
- (fn () => (EString (Domain.getUser ()), dl)))
+ (fn () => (EString "nogroup", dl)))
val _ = Defaults.registerDefault ("DocumentRoot",
(TBase "your_path", dl),
fun undown () = if imVersion1 () then Config.Apache.undown1 else Config.Apache.undown
fun reload () = if imVersion1 () then Config.Apache.reload1 else Config.Apache.reload
+fun logDir {user, node, vhostId} =
+ String.concat [Config.Apache.logDirOf (isVersion1 node) user,
+ "/",
+ node,
+ "/",
+ vhostId]
+
val () = Slave.registerFileHandler (fn fs =>
let
val spl = OS.Path.splitDirFile (#file fs)
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
+ OS.Path.base (#file spl) ^ ".ssl"
+ else
+ OS.Path.base (#file spl)
+
fun realLogDir user =
- let
- val realLogDir = Domain.homedirOf (valOf user)
- val realLogDir = OS.Path.joinDirFile
- {dir = realLogDir,
- file = "apache"}
- val realLogDir = OS.Path.joinDirFile
- {dir = realLogDir,
- file = "log"}
- val realLogDir = OS.Path.joinDirFile
- {dir = realLogDir,
- file = Slave.hostname ()}
- val {base, ...} = OS.Path.splitBaseExt (#file spl)
-
- val realLogDir = OS.Path.concat (realLogDir, base)
- in
- if String.isSuffix ".vhost_ssl" (#file spl) then
- realLogDir ^ ".ssl"
- else
- realLogDir
- end
+ logDir {user = valOf user,
+ node = Slave.hostname (),
+ vhostId = vhostId}
in
vhostsChanged := true;
case #action fs of
if Posix.FileSys.access (rld, []) then
()
else
- OS.FileSys.mkDir rld
+ Slave.mkDirAll rld
end
| _ =>
if Posix.FileSys.access (rld, []) then
()
else
- OS.FileSys.mkDir rld
+ Slave.mkDirAll rld
end
else
())
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, Domain.homedirOf user);
- TextIO.output (file, "/apache/log/");
- TextIO.output (file, node);
- TextIO.output (file, "/");
- TextIO.output (file, vhostId);
+ TextIO.output (file, ld);
TextIO.output (file, "/error.log\n\tCustomLog ");
- TextIO.output (file, Domain.homedirOf user);
- TextIO.output (file, "/apache/log/");
- TextIO.output (file, node);
- TextIO.output (file, "/");
- TextIO.output (file, vhostId);
+ TextIO.output (file, ld);
TextIO.output (file, "/access.log combined\n");
TextIO.output (file, "\tServerName ");
TextIO.output (file, fullHost);
+ app
+ (fn dom => (TextIO.output (file, "\n\tServerAlias ");
+ TextIO.output (file, host);
+ TextIO.output (file, ".");
+ TextIO.output (file, dom)))
+ (Domain.currentAliasDomains ());
if suexec then
if isVersion1 node then
(TextIO.output (file, "\n\tUser ");
TextIO.output (file, user))
else
();
- (Domain.homedirOf user ^ "/apache/log/"
- ^ node ^ "/" ^ vhostId, file)
+ (ld, file)
end)
nodes;
write "\n\tDocumentRoot ";
write cert)
| NONE => ();
write "\n";
- !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost}
+ !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost};
+ app (fn dom => !aliaser (host ^ "." ^ dom)) (Domain.currentAliasDomains ())
end,
fn () => (!post ();
write "</VirtualHost>\n";
app (fn opt => (write " "; write opt)) opts;
write "\n"))
-val () = Env.action_one "serverAlias"
+val () = Env.action_one "serverAliasHost"
("host", Env.string)
(fn host =>
(write "\tServerAlias ";
write "\n";
!aliaser host))
+val () = Env.action_one "serverAlias"
+ ("host", Env.string)
+ (fn host =>
+ (app
+ (fn dom =>
+ let
+ val full = host ^ "." ^ dom
+ in
+ write "\tServerAlias ";
+ write full;
+ write "\n";
+ !aliaser full
+ end)
+ (Domain.currentDomains ())))
+
+val () = Env.action_none "serverAliasDefault"
+ (fn () =>
+ (app
+ (fn dom =>
+ (write "\tServerAlias ";
+ write dom;
+ write "\n";
+ !aliaser dom))
+ (Domain.currentDomains ())))
+
val authType = fn (EVar "basic", _) => SOME "basic"
| (EVar "digest", _) => SOME "digest"
| _ => NONE