X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/0440f9547d8d088ccb3a212f866812a2db8220c2..f0732b22620010ff8b2adc812483e9de70eb5f4f:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index f21d3ac..9d751e8 100644
--- 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");
 
@@ -664,17 +665,26 @@ fun checkExpires () =
 	(write "\tExpiresActive on\n";
 	 expiresEnabled := true)
 
-val () = Env.action_three "localProxyRewrite"
-	 ("from", Env.string, "to", Env.string, "port", Env.int)
-	 (fn (from, to, port) =>
+val () = Env.action_four "proxyRewrite"
+	 ("from", Env.string, "to", Env.string, "tohost", Env.string, "flags", Env.list flag)
+	 (fn (from, to, tohost, flags) =>
 	     (checkRewrite ();
 	      write "\tRewriteRule\t\"";
 	      write from;
-	      write "\"\thttp://localhost:";
-	      write (Int.toString port);
-	      write "/";
+	      write "\"\t\"";
+	      write tohost;
+	      write "/"; (* ensure rewrite rule can't change port *)
 	      write to;
-	      write " [P]\n"))
+	      write "\"";
+	      write " [P";
+	      case flags of
+		  [] => ()
+		| flag::rest => (write ",";
+				 write flag;
+				 app (fn flag => (write ",";
+						  write flag)) rest);
+
+	      write "]\n"))
 
 val () = Env.action_four "expiresByType"
 	 ("mime", Env.string, "base", interval_base, "num", Env.int, "inter", interval)