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 (file)
--- 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 (file)
--- 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
                                               ();