X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/6bacfc5de947d3dbb8c2543d52bef5854148841c..60695e9923af9e74160575b5de0d5549808294b4:/src/plugins/webalizer.sml

diff --git a/src/plugins/webalizer.sml b/src/plugins/webalizer.sml
index 61d2b08..c6043af 100644
--- a/src/plugins/webalizer.sml
+++ b/src/plugins/webalizer.sml
@@ -33,8 +33,11 @@ val () = Apache.registerPre
 				   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, "/access.log\nOutputDir\t");
 				       TextIO.output (fd, Config.Webalizer.outputDir);
@@ -80,12 +83,16 @@ val () = Slave.registerFileHandler (fn fs =>
 										^ " -f "
 										^ Config.Webalizer.configDir
 										^ "/"
+										^ Slave.hostname ()
+										^ "/"
 										^ base
 										^ ".conf"));
 						     ignore (OS.Process.system (Config.rm
 										^ " -rf "
 										^ Config.Webalizer.outputDir
 										^ "/"
+										^ Slave.hostname ()
+										^ "/"
 										^ base)))
 						  | _ =>
 						    (ignore (OS.Process.system (Config.cp
@@ -94,10 +101,12 @@ val () = Slave.registerFileHandler (fn fs =>
 										^ " "
 										^ Config.Webalizer.configDir
 										^ "/"
+										^ Slave.hostname ()
+										^ "/"
 										^ base
 										^ ".conf"));
 						     let
-							 val dir = Config.Webalizer.outputDir ^ "/" ^ base
+							 val dir = Config.Webalizer.outputDir ^ "/" ^ Slave.hostname () ^ "/" ^ base
 						     in
 							 if Posix.FileSys.access (dir, []) then
 							     ()