Add cgiExtension

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 966240c..617420a 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -111,6 +111,15 @@ fun ssl e = case e of
              | (EApp ((EVar "use_cert", _), s), _) => Option.map SOME (Env.string s)
              | _ => NONE
 
+fun validExtension s =
+    size s > 0
+    andalso size s < 20
+    andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"_") s
+
+val _ = Env.type_one "file_extension"
+       Env.string
+       validExtension
+
 val defaults = [("WebPlaces",
                 (TList (TBase "web_place", dl), dl),
                 (fn () => (EList (map webPlaceDefault Config.Apache.webNodes_default), dl))),
@@ -178,6 +187,7 @@ val cond_flag = fn (EVar "cond_nocase", _) => SOME "NC"
 val apache_option = fn (EVar "execCGI", _) => SOME "ExecCGI"
                     | (EVar "includesNOEXEC", _) => SOME "IncludesNOEXEC"
                     | (EVar "indexes", _) => SOME "Indexes"
+                    | (EVar "followSymLinks", _) => SOME "FollowSymLinks"
                     | _ => NONE
 
 val autoindex_width = fn (EVar "autofit", _) => SOME "*"
@@ -267,6 +277,13 @@ fun logDir {user, node, vhostId} =
                   "/",
                   vhostId]
 
+fun realLogDir {user, node, vhostId} =
+    String.concat [Config.Apache.realLogDirOf user,
+                  "/",
+                  node,
+                  "/",
+                  vhostId]
+
 val () = Slave.registerFileHandler (fn fs =>
                                       let
                                           val spl = OS.Path.splitDirFile (#file fs)
@@ -539,7 +556,7 @@ val () = Env.container_one "directory"
 
 fun checkRewrite () =
     if !inLocal then
-       if !rewriteEnabled orelse !localRewriteEnabled then
+       if !localRewriteEnabled then
            ()
        else
            (write "\tRewriteEngine on\n";
@@ -653,12 +670,24 @@ val () = Env.action_two "scriptAlias"
 val () = Env.action_two "errorDocument"
         ("code", Env.string, "handler", Env.string)
         (fn (code, handler) =>
-            (write "\tErrorDocument\t";
-             write code;
-             write " ";
-             write handler;
-             write "\n"))
+            let
+                val hasSpaces = CharVector.exists Char.isSpace handler
 
+                fun maybeQuote () =
+                    if hasSpaces then
+                        write "\""
+                    else
+                        ()
+            in
+                write "\tErrorDocument\t";
+                write code;
+                write " ";
+                maybeQuote ();
+                write handler;
+                maybeQuote ();
+                write "\n"
+            end)
+                         
 val () = Env.action_one "options"
         ("options", Env.list apache_option)
         (fn opts =>
@@ -686,6 +715,12 @@ val () = Env.action_one "unset_options"
                       app (fn opt => (write " -"; write opt)) opts;
                       write "\n"))
 
+val () = Env.action_one "cgiExtension"
+        ("extension", Env.string)
+        (fn ext => (write "\tAddHandler cgi-script ";
+                    write ext;
+                    write "\n"))
+
 val () = Env.action_one "directoryIndex"
         ("filenames", Env.list Env.string)
         (fn opts =>