From: Adam Chlipala <adamc@hcoop.net>
Date: Wed, 6 Jun 2007 16:14:37 +0000 (+0000)
Subject: Change context requirement for rewriteBase; change CGI principal convention
X-Git-Tag: release_2010-11-19~197
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/fdf9a42df2892bae989ec2d47d5c22817dec7271

Change context requirement for rewriteBase; change CGI principal convention
---

diff --git a/lib/mod_rewrite.dtl b/lib/mod_rewrite.dtl
index 877e1c4..2e29877 100644
--- a/lib/mod_rewrite.dtl
+++ b/lib/mod_rewrite.dtl
@@ -54,7 +54,7 @@ extern val rewriteCond : no_spaces -> no_spaces -> [mod_rewrite_cond_flag] -> [^
 {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html#rewritecond">Apache
   documentation for <tt>RewriteCond</tt></a>.}}
 
-extern val rewriteBase : no_spaces -> [^Vhost];
+extern val rewriteBase : no_spaces -> [Location];
 {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html#rewritebase">Apache
   documentation for <tt>RewriteBase</tt></a>.}}
 
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 4a399e8..3266d54 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -445,7 +445,7 @@ val () = Env.containerV_one "vhost"
 					   if isWaklog node then
 					       (TextIO.output (file, "\n\tWaklogProtected on\n\tWaklogPrincipal ");
 						TextIO.output (file, user);
-						TextIO.output (file, "/cgi@HCOOP.NET /etc/keytabs/cgi/");
+						TextIO.output (file, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
 						TextIO.output (file, user))
 					   else
 					       ();