From: Adam Chlipala <adamc@hcoop.net>
Date: Wed, 20 Jun 2007 23:47:42 +0000 (+0000)
Subject: New mod_waklog version
X-Git-Tag: release_2010-11-19~192
X-Git-Url: https://git.hcoop.net/jyaworski/domtool2.git/commitdiff_plain/a09d0e829dadfe9c59724b1f953f50d148747f99

New mod_waklog version
---

diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg
index 0a58d57..053d17a 100644
--- a/configDefault/apache.cfg
+++ b/configDefault/apache.cfg
@@ -12,7 +12,7 @@ val undown1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-undown"
 
 val confDir = "/var/domtool/vhosts"
 
-val webNodes_all = [("mire", {version = APACHE_1_3, auth = MOD_WAKLOG})]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
 val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
 
 val webNodes_default = ["mire"]
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 3266d54..09dbf98 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -443,7 +443,7 @@ val () = Env.containerV_one "vhost"
 					   else
 					       ();
 					   if isWaklog node then
-					       (TextIO.output (file, "\n\tWaklogProtected on\n\tWaklogPrincipal ");
+					       (TextIO.output (file, "\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
 						TextIO.output (file, user);
 						TextIO.output (file, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
 						TextIO.output (file, user))