open Ast
+val _ = Env.type_one "web_node"
+ Env.string
+ (fn node =>
+ List.exists (fn x => x = node) Config.Apache.webNodes_all
+ orelse (Domain.hasPriv "www"
+ andalso List.exists (fn x => x = node) Config.Apache.webNodes_admin))
+
+val _ = Env.registerFunction ("web_node_to_node",
+ fn [e] => SOME e
+ | _ => NONE)
+
val _ = Env.type_one "proxy_port"
Env.int
(fn n => n > 1024)
val dl = ErrorMsg.dummyLoc
val _ = Defaults.registerDefault ("WebNodes",
- (TList (TBase "node", dl), dl),
- (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes), dl)))
+ (TList (TBase "web_node", dl), dl),
+ (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl)))
val _ = Defaults.registerDefault ("SSL",
(TBase "bool", dl),
val _ = Defaults.registerDefault ("DocumentRoot",
(TBase "your_path", dl),
- (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/public_html"), dl)))
+ (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/" ^ Config.Apache.public_html), dl)))
val _ = Defaults.registerDefault ("ServerAdmin",
(TBase "email", dl),
fun write s = app (fn (_, file) => TextIO.output (file, s)) (!vhostFiles)
val rewriteEnabled = ref false
+val localRewriteEnabled = ref false
val currentVhost = ref ""
val currentVhostId = ref ""
currentVhostId := vhostId;
rewriteEnabled := false;
+ localRewriteEnabled := false;
vhostFiles := map (fn node =>
let
val file = Domain.domainFile {node = node,
write "</VirtualHost>\n";
app (TextIO.closeOut o #2) (!vhostFiles)))
+val inLocal = ref false
+
val () = Env.container_one "location"
("prefix", Env.string)
(fn prefix =>
(write "\t<Location ";
write prefix;
- write ">\n"),
- fn () => write "\t</Location>\n")
+ write ">\n";
+ inLocal := true),
+ fn () => (write "\t</Location>\n";
+ inLocal := false;
+ localRewriteEnabled := false))
val () = Env.container_one "directory"
("directory", Env.string)
(fn directory =>
(write "\t<Directory ";
write directory;
- write ">\n"),
- fn () => write "\t</Directory>\n")
+ write ">\n";
+ inLocal := true),
+ fn () => (write "\t</Directory>\n";
+ inLocal := false;
+ localRewriteEnabled := false))
fun checkRewrite () =
- if !rewriteEnabled then
+ if !inLocal then
+ if !rewriteEnabled orelse !localRewriteEnabled then
+ ()
+ else
+ (write "\tRewriteEngine on\n";
+ localRewriteEnabled := true)
+ else if !rewriteEnabled then
()
else
(write "\tRewriteEngine on\n";
write ty;
write "\n"))
-val () = Env.action_one "davSvn"
+(*val () = Env.action_one "davSvn"
("path", Env.string)
(fn path => (write "\tDAV svn\n\tSVNPath ";
write path;
("path", Env.string)
(fn path => (write "\tAuthzSVNAccessFile ";
write path;
- write "\n"))
+ write "\n"))*)
val () = Env.action_two "addDescription"
("description", Env.string, "patterns", Env.list Env.string)