Add DAVLockDB line for every vhost

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index e4e96ea..f935549 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -1,5 +1,5 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006, Adam Chlipala
+ * Copyright (c) 2006-2007, Adam Chlipala
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -353,6 +353,7 @@ val rewriteEnabled = ref false
 val localRewriteEnabled = ref false
 val currentVhost = ref ""
 val currentVhostId = ref ""
+val sslEnabled = ref false
 
 val pre = ref (fn _ : {user : string, nodes : string list, id : string, hostname : string} => ())
 fun registerPre f =
@@ -397,6 +398,7 @@ val () = Env.containerV_one "vhost"
             in
                 currentVhost := fullHost;
                 currentVhostId := vhostId;
+                sslEnabled := Option.isSome ssl;
 
                 rewriteEnabled := false;
                 localRewriteEnabled := false;
@@ -429,6 +431,7 @@ val () = Env.containerV_one "vhost"
                                                           TextIO.output (file, ".");
                                                           TextIO.output (file, dom)))
                                               (Domain.currentAliasDomains ());
+
                                           if suexec then
                                               if isVersion1 node then
                                                   (TextIO.output (file, "\n\tUser ");
@@ -442,6 +445,7 @@ val () = Env.containerV_one "vhost"
                                                    TextIO.output (file, group))
                                           else
                                               ();
+
                                           if isWaklog node then
                                               (TextIO.output (file, "\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
                                                TextIO.output (file, user);
@@ -449,6 +453,11 @@ val () = Env.containerV_one "vhost"
                                                TextIO.output (file, user))
                                           else
                                               ();
+
+                                          TextIO.output (file, "\n\tDAVLockDB /var/lock/apache2/dav.");
+                                          TextIO.output (file, user);
+                                          TextIO.output (file, "/DAVLock");
+
                                           (ld, file)
                                       end)
                                   nodes;
@@ -687,16 +696,22 @@ val authType = fn (EVar "basic", _) => SOME "basic"
                | (EVar "kerberos", _) => SOME "kerberos"
                | _ => NONE
 
+fun allowAuthType "kerberos" = !sslEnabled
+  | allowAuthType _ = true
+
 val () = Env.action_one "authType"
         ("type", authType)
         (fn ty =>
-            (write "\tAuthType ";
-             write ty;
-             write "\n";
-             case ty of
-                 "kerberos" => 
-                 write "\tKrbMethodNegotiate off\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC off\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
-               | _ => ()))
+            if allowAuthType ty then
+                (write "\tAuthType ";
+                 write ty;
+                 write "\n";
+                 case ty of
+                     "kerberos" => 
+                     write "\tKrbMethodNegotiate off\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC off\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
+                   | _ => ())
+            else
+                print "WARNING: Skipped Kerberos authType because this isn't an SSL vhost.\n")
 
 val () = Env.action_one "authName"
         ("name", Env.string)