apache: move davlockdb to /var/local

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index a490419..9d751e8 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -474,6 +474,7 @@ fun vhostPost () = (!post ();
 val php_version = fn (EVar "php56", _) => SOME 56
                    | (EVar "php72", _) => SOME 72
                   | (EVar "php73", _) => SOME 73
+                  | (EVar "php74", _) => SOME 74
                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
@@ -560,7 +561,7 @@ fun vhostBody (env, makeFullHost) =
                                  else
                                      ();
 
-                                 TextIO.output (file, "\n\tDAVLockDB /var/lock/apache2/dav/");
+                                 TextIO.output (file, "\n\tDAVLockDB /var/local/domtool/apache2/dav/");
                                  TextIO.output (file, user);
                                  TextIO.output (file, "/DAVLock");
 
@@ -665,8 +666,8 @@ fun checkExpires () =
         expiresEnabled := true)
 
 val () = Env.action_four "proxyRewrite"
-        ("from", Env.string, "tohost", Env.string, "to", Env.string, "flags", Env.list flag)
-        (fn (from, tohost, to, flags) =>
+        ("from", Env.string, "to", Env.string, "tohost", Env.string, "flags", Env.list flag)
+        (fn (from, to, tohost, flags) =>
             (checkRewrite ();
              write "\tRewriteRule\t\"";
              write from;