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