(* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006-2007, Adam Chlipala
+ * Copyright (c) 2006-2009, Adam Chlipala
+ * Copyright (c) 2013 Clinton Ebadi
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
fun default () = List.exists (fn s' => s = s') Config.Apache.proxyTargets
in
case String.fields (fn ch => ch = #":") s of
- ["http", "//localhost", rest] =>
- (case String.fields (fn ch => ch = #"/") rest of
- port :: _ =>
- (case Int.fromString port of
- NONE => default ()
- | SOME n => n > 1024 orelse default ())
- | _ => default ())
+ "http" :: host :: rest =>
+ let
+ val rest = String.concatWith ":" rest
+ in
+ if List.exists (fn h' => host = h') (map (fn h => String.concat ["//", h]) Config.Apache.proxyHosts)
+ then
+ CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
+ andalso ch <> #"\"" andalso ch <> #"'") rest
+ andalso case String.fields (fn ch => ch = #"/") rest of
+ port :: _ =>
+ (case Int.fromString port of
+ NONE => default ()
+ | SOME n => n > 1024 orelse default ())
+ | _ => default ()
+ else
+ default ()
+ end
| _ => default ()
end)
class = "cert",
value = s}
+fun validCaCert s = Acl.query {user = Domain.getUser (),
+ class = "cacert",
+ value = s}
+
val _ = Env.type_one "ssl_cert_path"
Env.string
validCert
+val _ = Env.type_one "ssl_cacert_path"
+ Env.string
+ validCaCert
+
fun ssl e = case e of
(EVar "no_ssl", _) => SOME NONE
| (EApp ((EVar "use_cert", _), s), _) => Option.map SOME (Env.string s)
(fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl))),
("SuExec",
(TBase "suexec_flag", dl),
- (fn () => (EVar "true", dl)))]
+ (fn () => (EVar "true", dl))),
+ ("PhpVersion",
+ (TBase "php_version", dl),
+ (fn () => (EVar "php5", dl)))]
val () = app Defaults.registerDefault defaults
| (EVar "includesNOEXEC", _) => SOME "IncludesNOEXEC"
| (EVar "indexes", _) => SOME "Indexes"
| (EVar "followSymLinks", _) => SOME "FollowSymLinks"
+ | (EVar "multiViews", _) => SOME "MultiViews"
| _ => NONE
val autoindex_width = fn (EVar "autofit", _) => SOME "*"
| _ => NONE
+val interval_base = fn (EVar "access", _) => SOME "access"
+ | (EVar "modification", _) => SOME "modification"
+ | _ => NONE
+
+val interval = fn (EVar "years", _) => SOME "years"
+ | (EVar "months", _) => SOME "months"
+ | (EVar "weeks", _) => SOME "weeks"
+ | (EVar "days", _) => SOME "days"
+ | (EVar "hours", _) => SOME "hours"
+ | (EVar "minutes", _) => SOME "minutes"
+ | (EVar "seconds", _) => SOME "seconds"
+ | _ => NONE
+
val vhostsChanged = ref false
val logDeleted = ref false
+val delayedLogMoves = ref (fn () => ())
val () = Slave.registerPreHandler
(fn () => (vhostsChanged := false;
- logDeleted := false))
+ logDeleted := false;
+ delayedLogMoves := (fn () => print "Executing delayed log moves/deletes.\n")))
fun findVhostUser fname =
let
Slave.Delete _ =>
let
val ldir = realLogDir oldUser
+ val dlm = !delayedLogMoves
in
if !logDeleted then
()
else
- (ignore (OS.Process.system (down ()));
+ ((*ignore (OS.Process.system (down ()));*)
ignore (OS.Process.system (fixperms ()));
logDeleted := true);
ignore (OS.Process.system (Config.rm
^ " -rf "
^ realVhostFile));
- Slave.moveDirCreate {from = ldir,
- to = backupLogs ()}
+ delayedLogMoves := (fn () => (dlm ();
+ Slave.moveDirCreate {from = ldir,
+ to = backupLogs ()}))
end
| Slave.Add =>
let
let
val old = realLogDir oldUser
val rld = realLogDir user
+
+ val dlm = !delayedLogMoves
in
if !logDeleted then
()
else
- (ignore (OS.Process.system (down ()));
+ ((*ignore (OS.Process.system (down ()));*)
logDeleted := true);
- ignore (OS.Process.system (Config.rm
- ^ " -rf "
- ^ realLogDir oldUser));
+ delayedLogMoves := (fn () => (dlm ();
+ ignore (OS.Process.system (Config.rm
+ ^ " -rf "
+ ^ realLogDir oldUser))));
if Posix.FileSys.access (rld, []) then
()
else
val () = Slave.registerPostHandler
(fn () =>
(if !vhostsChanged then
- Slave.shellF ([if !logDeleted then undown () else reload ()],
- fn cl => "Error reloading Apache with " ^ cl)
+ (Slave.shellF ([reload ()],
+ fn cl => "Error reloading Apache with " ^ cl);
+ if !logDeleted then !delayedLogMoves () else ())
else
()))
val rewriteEnabled = ref false
val localRewriteEnabled = ref false
+val expiresEnabled = ref false
+val localExpiresEnabled = ref false
val currentVhost = ref ""
val currentVhostId = ref ""
val sslEnabled = ref false
write "</VirtualHost>\n";
app (TextIO.closeOut o #2) (!vhostFiles))
+val php_version = fn (EVar "php5", _) => SOME 5
+ | _ => NONE
+
fun vhostBody (env, makeFullHost) =
let
val places = Env.env (Env.list webPlace) (env, "WebPlaces")
val docroot = Env.env Env.string (env, "DocumentRoot")
val sadmin = Env.env Env.string (env, "ServerAdmin")
val suexec = Env.env Env.bool (env, "SuExec")
+ val php = Env.env php_version (env, "PhpVersion")
val fullHost = makeFullHost (Domain.currentDomain ())
val vhostId = fullHost ^ (if Option.isSome ssl then ".ssl" else "")
rewriteEnabled := false;
localRewriteEnabled := false;
+ expiresEnabled := false;
+ localExpiresEnabled := false;
vhostFiles := map (fn (node, ip) =>
let
val file = Domain.domainFile {node = node,
TextIO.output (file, group))
else
(TextIO.output (file, "\n\tSuexecUserGroup ");
+ TextIO.output (file, user);
+ TextIO.output (file, " ");
+ TextIO.output (file, group);
+ TextIO.output (file, "\n\tsuPHP_UserGroup ");
TextIO.output (file, user);
TextIO.output (file, " ");
TextIO.output (file, group))
TextIO.output (file, user);
TextIO.output (file, "/DAVLock");
+ if php <> Config.Apache.defaultPhpVersion then
+ (TextIO.output (file, "\n\tAddHandler x-httpd-php");
+ TextIO.output (file, Int.toString php);
+ TextIO.output (file, " .php .phtml"))
+ else
+ ();
+
(ld, file)
end)
places;
inLocal := true),
fn () => (write "\t</Location>\n";
inLocal := false;
- localRewriteEnabled := false))
+ localRewriteEnabled := false;
+ localExpiresEnabled := false))
val () = Env.container_one "directory"
("directory", Env.string)
inLocal := true),
fn () => (write "\t</Directory>\n";
inLocal := false;
- localRewriteEnabled := false))
+ localRewriteEnabled := false;
+ localExpiresEnabled := false))
+
+val () = Env.container_one "filesMatch"
+ ("regexp", Env.string)
+ (fn prefix =>
+ (write "\t<FilesMatch \"";
+ write prefix;
+ write "\">\n"),
+ fn () => (write "\t</FilesMatch>\n";
+ localRewriteEnabled := false;
+ localExpiresEnabled := false))
fun checkRewrite () =
if !inLocal then
(write "\tRewriteEngine on\n";
rewriteEnabled := true)
+fun checkExpires () =
+ if !inLocal then
+ if !localExpiresEnabled then
+ ()
+ else
+ (write "\tExpiresActive on\n";
+ localExpiresEnabled := true)
+ else if !expiresEnabled then
+ ()
+ else
+ (write "\tExpiresActive on\n";
+ expiresEnabled := true)
+
val () = Env.action_three "localProxyRewrite"
("from", Env.string, "to", Env.string, "port", Env.int)
(fn (from, to, port) =>
(checkRewrite ();
- write "\tRewriteRule\t";
+ write "\tRewriteRule\t\"";
write from;
- write "\thttp://localhost:";
+ write "\"\thttp://localhost:";
write (Int.toString port);
write "/";
write to;
write " [P]\n"))
+val () = Env.action_four "expiresByType"
+ ("mime", Env.string, "base", interval_base, "num", Env.int, "inter", interval)
+ (fn (mime, base, num, inter) =>
+ (checkExpires ();
+ write "\tExpiresByType\t\"";
+ write mime;
+ write "\"\t\"";
+ write base;
+ write " plus ";
+ if num < 0 then
+ (write "-";
+ write (Int.toString (~num)))
+ else
+ write (Int.toString num);
+ write " ";
+ write inter;
+ write "\"\n"))
+
val () = Env.action_two "proxyPass"
("from", Env.string, "to", Env.string)
(fn (from, to) =>
("from", Env.string, "to", Env.string, "flags", Env.list flag)
(fn (from, to, flags) =>
(checkRewrite ();
- write "\tRewriteRule\t";
+ write "\tRewriteRule\t\"";
write from;
- write "\t";
+ write "\"\t\"";
write to;
+ write "\"";
case flags of
[] => ()
| flag::rest => (write " [";
("test", Env.string, "pattern", Env.string, "flags", Env.list cond_flag)
(fn (from, to, flags) =>
(checkRewrite ();
- write "\tRewriteCond\t";
+ write "\tRewriteCond\t\"";
write from;
- write "\t";
+ write "\"\t\"";
write to;
+ write "\"";
case flags of
[] => ()
| flag::rest => (write " [";
("prefix", Env.string)
(fn prefix =>
(checkRewrite ();
- write "\tRewriteBase\t";
+ write "\tRewriteBase\t\"";
write prefix;
- write "\n"))
+ write "\"\n"))
val () = Env.action_one "rewriteLogLevel"
("level", Env.int)
write name;
write "\n"))
+val () = Env.action_one "authGroupFile"
+ ("file", Env.string)
+ (fn name =>
+ (write "\tAuthGroupFile ";
+ write name;
+ write "\n"))
+
val () = Env.action_none "requireValidUser"
(fn () => write "\tRequire valid-user\n")
app (fn pat => (write " "; write pat)) pats;
write "\n"))
+val () = Env.action_two "addIcon"
+ ("icon", Env.string, "patterns", Env.list Env.string)
+ (fn (icon, pats) =>
+ case pats of
+ [] => ()
+ | _ => (write "\tAddIcon \"";
+ write icon;
+ write "\"";
+ app (fn pat => (write " "; write pat)) pats;
+ write "\n"))
+
val () = Env.action_one "indexOptions"
("options", Env.list autoindex_option)
(fn opts =>
(write "="; write arg)) arg)) opts;
write "\n"))
+val () = Env.action_one "indexIgnore"
+ ("patterns", Env.list Env.string)
+ (fn pats =>
+ case pats of
+ [] => ()
+ | _ => (write "\tIndexIgnore";
+ app (fn pat => (write " "; write pat)) pats;
+ write "\n"))
+
val () = Env.action_one "set_indexOptions"
("options", Env.list autoindex_option)
(fn opts =>
write path;
write "\"\n"))
-val php_version = fn (EVar "php4", _) => SOME 4
- | (EVar "php5", _) => SOME 5
- | _ => NONE
-
val () = Env.action_one "phpVersion"
("version", php_version)
(fn version => (write "\tAddHandler x-httpd-php";
write "\n")
| _ => ())
+val () = Env.action_one "sslCertificateChainFile"
+ ("ssl_cacert_path", Env.string)
+ (fn cacert =>
+ if !sslEnabled then
+ (write "\tSSLCertificateChainFile \"";
+ write cacert;
+ write "\"\n")
+ else
+ print "WARNING: Skipped sslCertificateChainFile because this isn't an SSL vhost.\n")
+
val () = Domain.registerResetLocal (fn () =>
ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
Domain.Extension {extension = "vhost_ssl",
heading = fn host => "SSL web vhost " ^ host ^ ":"}])
+val () = Env.action_none "testNoHtaccess"
+ (fn path => write "\tAllowOverride None\n")
+
+fun writeWaklogUserFile () =
+ let
+ val users = Acl.users ()
+ val outf = TextIO.openOut Config.Apache.waklogUserFile
+ in
+ app (fn user => if String.isSuffix "_admin" user then
+ ()
+ else
+ (TextIO.output (outf, "<Location /~");
+ TextIO.output (outf, user);
+ TextIO.output (outf, ">\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
+ TextIO.output (outf, user);
+ TextIO.output (outf, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
+ TextIO.output (outf, user);
+ TextIO.output (outf, "\n</Location>\n\n"))) users;
+ TextIO.closeOut outf
+ end
+
+val () = Domain.registerOnUsersChange writeWaklogUserFile
+
end
HCoop / hcoop / domtool2.git / blobdiff