(* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006, Adam Chlipala
+ * Copyright (c) 2006-2007, Adam Chlipala
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
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 reload () = if imVersion1 () then Config.Apache.reload1 else Config.Apache.reload
fun logDir {user, node, vhostId} =
- String.concat [Domain.homedirOf user,
- "/apache/log/",
+ String.concat [Config.Apache.logDirOf (isVersion1 node) user,
+ "/",
node,
"/",
vhostId]
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)
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
())
val localRewriteEnabled = ref false
val currentVhost = ref ""
val currentVhostId = ref ""
+val sslEnabled = ref false
val pre = ref (fn _ : {user : string, nodes : string list, id : string, hostname : string} => ())
fun registerPre f =
in
currentVhost := fullHost;
currentVhostId := vhostId;
+ sslEnabled := Option.isSome ssl;
rewriteEnabled := false;
localRewriteEnabled := false;
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);
+ 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, group))
else
();
+
if isWaklog node then
- (TextIO.output (file, "\n\tWaklogProtected on\n\tWaklogPrincipal ");
+ (TextIO.output (file, "\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
TextIO.output (file, user);
- TextIO.output (file, "/cgi@HCOOP.NET /etc/keytabs/cgi/");
+ TextIO.output (file, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
TextIO.output (file, user))
else
();
- (logDir {user = user, node = node, vhostId = vhostId}, file)
+
+ TextIO.output (file, "\n\tDAVLockDB /var/lock/apache2/dav.");
+ TextIO.output (file, user);
+ TextIO.output (file, "/DAVLock");
+
+ (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";
write "]");
write "\n"))
+val () = Env.action_one "rewriteBase"
+ ("prefix", Env.string)
+ (fn prefix =>
+ (checkRewrite ();
+ write "\tRewriteBase\t";
+ write prefix;
+ write "\n"))
+
val () = Env.action_one "rewriteLogLevel"
("level", Env.int)
(fn level =>
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"
+ | (EVar "kerberos", _) => SOME "kerberos"
| _ => NONE
+fun allowAuthType "kerberos" = !sslEnabled
+ | allowAuthType _ = true
+
val () = Env.action_one "authType"
("type", authType)
(fn ty =>
- (write "\tAuthType ";
- write ty;
- write "\n"))
+ if allowAuthType ty then
+ (write "\tAuthType ";
+ write ty;
+ write "\n";
+ case ty of
+ "kerberos" =>
+ write "\tKrbMethodNegotiate off\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC off\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
+ | _ => ())
+ else
+ print "WARNING: Skipped Kerberos authType because this isn't an SSL vhost.\n")
val () = Env.action_one "authName"
("name", Env.string)
write name;
write "\n"))
+val () = Env.action_two "setEnv"
+ ("key", Env.string, "value", Env.string)
+ (fn (key, value) => (write "\tSetEnv \"";
+ write key;
+ write "\" \"";
+ write value;
+ write "\"\n"))
+
val () = Domain.registerResetLocal (fn () =>
ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
HCoop / hcoop / domtool2.git / blobdiff