val dl = ErrorMsg.dummyLoc
-val _ = Defaults.registerDefault ("WebNodes",
- (TList (TBase "web_node", dl), dl),
- (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl)))
-
-val _ = Defaults.registerDefault ("SSL",
- (TBase "ssl", dl),
- (fn () => (EVar "no_ssl", dl)))
-
-val _ = Defaults.registerDefault ("User",
- (TBase "your_user", dl),
- (fn () => (EString (Domain.getUser ()), dl)))
-
-val _ = Defaults.registerDefault ("Group",
- (TBase "your_group", dl),
- (fn () => (EString "nogroup", dl)))
-
-val _ = Defaults.registerDefault ("DocumentRoot",
- (TBase "your_path", dl),
- (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl)))
-
-val _ = Defaults.registerDefault ("ServerAdmin",
- (TBase "email", dl),
- (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)))
-
-val _ = Defaults.registerDefault ("SuExec",
- (TBase "suexec_flag", dl),
- (fn () => (EVar "true", dl)))
+val defaults = [("WebNodes",
+ (TList (TBase "web_node", dl), dl),
+ (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl))),
+ ("SSL",
+ (TBase "ssl", dl),
+ (fn () => (EVar "no_ssl", dl))),
+ ("User",
+ (TBase "your_user", dl),
+ (fn () => (EString (Domain.getUser ()), dl))),
+ ("Group",
+ (TBase "your_group", dl),
+ (fn () => (EString "nogroup", dl))),
+ ("DocumentRoot",
+ (TBase "your_path", dl),
+ (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl))),
+ ("ServerAdmin",
+ (TBase "email", dl),
+ (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl))),
+ ("SuExec",
+ (TBase "suexec_flag", dl),
+ (fn () => (EVar "true", dl)))]
+
+val () = app Defaults.registerDefault defaults
val redirect_code = fn (EVar "temp", _) => SOME "temp"
| (EVar "permanent", _) => SOME "permanent"
vhostsChanged := true;
case #action fs of
Slave.Delete =>
- (if !logDeleted then
- ()
- else
- (ignore (OS.Process.system (down ()));
- logDeleted := true);
- ignore (OS.Process.system (Config.rm
- ^ " -rf "
- ^ realVhostFile));
- ignore (OS.Process.system (Config.rm
- ^ " -rf "
- ^ realLogDir oldUser)))
+ let
+ val ldir = realLogDir oldUser
+ in
+ if !logDeleted then
+ ()
+ else
+ (ignore (OS.Process.system (down ()));
+ logDeleted := true);
+ ignore (OS.Process.system (Config.rm
+ ^ " -rf "
+ ^ realVhostFile));
+ Slave.moveDirCreate {from = ldir,
+ to = Config.Apache.backupLogDirOf
+ (isVersion1 (Slave.hostname ()))}
+ end
| Slave.Add =>
let
val rld = realLogDir user
if Posix.FileSys.access (rld, []) then
()
else
- Slave.mkDirAll rld
+ Slave.moveDirCreate {from = Config.Apache.backupLogDirOf
+ (isVersion1 (Slave.hostname ())),
+ to = rld}
end
| _ =>
val () = Domain.registerResetLocal (fn () =>
ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
+val () = Domain.registerDescriber (Domain.considerAll
+ [Domain.Extension {extension = "vhost",
+ heading = fn host => "Web vhost " ^ host},
+ Domain.Extension {extension = "vhost_ssl",
+ heading = fn host => "SSL web vhost " ^ host}])
+
end