Allow ~ in Apache locations

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 7b8f68e..300ffa4 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -96,7 +96,8 @@ fun validLocation s =
                                                           orelse ch = #"-"
                                                           orelse ch = #"_"
                                                           orelse ch = #"."
-                                                          orelse ch = #"/") s
+                                                          orelse ch = #"/"
+                                                          orelse ch = #"~") s
 
 val _ = Env.type_one "location"
        Env.string
@@ -971,6 +972,12 @@ val () = Env.action_two "setEnv"
                                                        | ch => str ch) value);
                              write "\"\n"))
 
+val () = Env.action_one "diskCache"
+        ("path", Env.string)
+        (fn path => (write "\tCacheEnable disk \"";
+                     write path;
+                     write "\"\n"))
+        
 val () = Domain.registerResetLocal (fn () =>
                                       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))