Make Webalizer the capitalization pedant happy

[hcoop/domtool2.git] / src / plugins / webalizer.sml

diff --git a/src/plugins/webalizer.sml b/src/plugins/webalizer.sml
index c6043af..b344165 100644 (file)
--- a/src/plugins/webalizer.sml
+++ b/src/plugins/webalizer.sml
@@ -32,13 +32,7 @@ val () = Apache.registerPre
                                                                   name = id ^ ".wbl"}
                                   in
                                       TextIO.output (fd, "LogFile\t");
-                                      TextIO.output (fd, Config.homeBase);
-                                      TextIO.output (fd, "/");
-                                      TextIO.output (fd, user);
-                                      TextIO.output (fd, "/apache/log/");
-                                      TextIO.output (fd, node);
-                                      TextIO.output (fd, "/");
-                                      TextIO.output (fd, hostname);
+                                      TextIO.output (fd, Apache.logDir {user = user, node = node, vhostId = hostname});
                                       TextIO.output (fd, "/access.log\nOutputDir\t");
                                       TextIO.output (fd, Config.Webalizer.outputDir);
                                       TextIO.output (fd, "/");
@@ -51,7 +45,7 @@ val () = Apache.registerPre
             in
                 files := fds;
                 write := (fn s => app (fn fd => TextIO.output (fd, s)) fds);
-                !write "Hostname\t";
+                !write "HostName\t";
                 !write hostname;
                 !write "\nHideSite\t";
                 !write hostname;
@@ -116,4 +110,10 @@ val () = Slave.registerFileHandler (fn fs =>
                                             | _ => ()
                                       end)
 
+val () = Domain.registerResetLocal (fn () =>
+                                      app (fn (node, _) =>
+                                              ignore (OS.Process.system (Config.rm ^ " -rf "
+                                                                         ^ Config.Webalizer.configDir ^ "/"
+                                                                         ^ node ^ "/*"))) Config.nodeIps)
+
 end