From: Adam Chlipala <adamc@hcoop.net>
Date: Tue, 12 Dec 2006 03:06:50 +0000 (+0000)
Subject: Fix Webalizer path generation
X-Git-Tag: release_2010-11-19~320
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/5e70d4e2dbbaefcac582ca363f5ea39d91b84b65?hp=613c338c012a0dcd1b8e97882f61c543264c146b

Fix Webalizer path generation
---

diff --git a/src/plugins/webalizer.sml b/src/plugins/webalizer.sml
index 2237fe5..c6043af 100644
--- a/src/plugins/webalizer.sml
+++ b/src/plugins/webalizer.sml
@@ -33,6 +33,8 @@ 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, "/");
@@ -81,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
@@ -95,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
 							     ()