New mod_waklog version

[hcoop/domtool2.git] / src / plugins / apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index e5fe47b..09dbf98 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -103,7 +103,7 @@ val _ = Defaults.registerDefault ("User",
 
 val _ = Defaults.registerDefault ("Group",
                                  (TBase "your_group", dl),
-                                 (fn () => (EString (Domain.getUser ()), dl)))
+                                 (fn () => (EString "nogroup", dl)))
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),
@@ -443,9 +443,9 @@ 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, "/cgi@HCOOP.NET /etc/keytabs/cgi/");
+                                               TextIO.output (file, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
                                                TextIO.output (file, user))
                                           else
                                               ();
@@ -570,6 +570,14 @@ val () = Env.action_three "rewriteCond"
                                 write "]");
              write "\n"))
 
+val () = Env.action_one "rewriteBase"
+        ("prefix", Env.string)
+        (fn prefix =>
+            (checkRewrite ();
+             write "\tRewriteBase\t";
+             write prefix;
+             write "\n"))
+
 val () = Env.action_one "rewriteLogLevel"
         ("level", Env.int)
         (fn level =>
@@ -676,6 +684,7 @@ val () = Env.action_none "serverAliasDefault"
 
 val authType = fn (EVar "basic", _) => SOME "basic"
                | (EVar "digest", _) => SOME "digest"
+               | (EVar "kerberos", _) => SOME "kerberos"
                | _ => NONE
 
 val () = Env.action_one "authType"
@@ -683,7 +692,11 @@ val () = Env.action_one "authType"
         (fn ty =>
             (write "\tAuthType ";
              write ty;
-             write "\n"))
+             write "\n";
+             case ty of
+                 "kerberos" => 
+                 write "\tKrbMethodNegotiate off\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC off\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
+               | _ => ()))
 
 val () = Env.action_one "authName"
         ("name", Env.string)