apache: fix missing newline in fastScriptAlias

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 40db891..6de4f1b 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -160,6 +160,7 @@ val redirect_code = fn (EVar "temp", _) => SOME "temp"
                     | (EVar "redir304", _) => SOME "304"
                     | (EVar "redir305", _) => SOME "305"
                     | (EVar "redir307", _) => SOME "307"
+                    | (EVar "notfound", _) => SOME "404"
                     | _ => NONE
 
 val flag = fn (EVar "redirect", _) => SOME "R"
@@ -466,7 +467,8 @@ fun vhostPost () = (!post ();
                    app (TextIO.closeOut o #2) (!vhostFiles))
 
 val php_version = fn (EVar "php5", _) => SOME 5
-                  | _ => NONE
+                   | (EVar "fast_php", _) => SOME 6
+                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
     let
@@ -550,14 +552,27 @@ fun vhostBody (env, makeFullHost) =
                                  TextIO.output (file, user);
                                  TextIO.output (file, "/DAVLock");
 
-                                 if php <> Config.Apache.defaultPhpVersion then
+                                 if php = Config.Apache.defaultPhpVersion
+                                 then
+                                     ()
+                                 else if php = 6
+                                 then
+                                     (* fastcgi php 5.6 since 6 doesn't exist *)
+                                     (TextIO.output (file, "\n\tAddHandler fcgid-script .php .phtml");
+                                      (* FIXME: only set kerberos wrapper of waklog is on *)
+                                      map (fn ext => (TextIO.output (file, "\n\tFcgidWrapper \"");
+                                                      TextIO.output (file, Config.Apache.fastCgiWrapperOf user);
+                                                      TextIO.output (file, " ");
+                                                      TextIO.output (file, Config.Apache.phpFastCgiWrapper);
+                                                      TextIO.output (file, "\" ");
+                                                      TextIO.output (file, ext)))
+                                          [".php", ".phtml"];
+                                      ())
+                                 else
                                      (TextIO.output (file, "\n\tAddHandler x-httpd-php");
                                       TextIO.output (file, Int.toString php);
-                                      TextIO.output (file, " .php .phtml"))
-                                 else
-                                     ();
-
-                                 (ld, file)
+                                      TextIO.output (file, " .php .phtml"));
+                         (ld, file)
                              end)
                          places;
        write "\n\tDocumentRoot ";
@@ -682,7 +697,7 @@ val () = Env.action_two "proxyPass"
                  write from;
                  write "\t";
                  write to;
-                 write "\n"))
+                 write "\tretry=0\n"))
 
 val () = Env.action_two "proxyPassReverse"
         ("from", Env.string, "to", Env.string)
@@ -772,6 +787,25 @@ val () = Env.action_two "scriptAlias"
              write to;
              write "\n"))
 
+val () = Env.action_two "fastScriptAlias"
+        ("from", Env.string, "to", Env.string)
+        (fn (from, to) =>
+            (write "\tAlias\t";
+             write from;
+             write " ";
+             write to;
+             write "\n";
+
+             write "\t<Location ";
+             write from;
+             write ">\n";
+             write "\t\tSetHandler fcgid-script\n";
+             (* FIXME: only set kerberos wrapper of waklog is on *)
+             write "\t\tFcgidWrapper \"";
+             write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
+             write "\"\n";
+             write "\t</Location>\n"))
+
 val () = Env.action_two "errorDocument"
         ("code", Env.string, "handler", Env.string)
         (fn (code, handler) =>
@@ -1101,9 +1135,20 @@ val () = Env.action_one "diskCache"
 
 val () = Env.action_one "phpVersion"
         ("version", php_version)
-        (fn version => (write "\tAddHandler x-httpd-php";
-                        write (Int.toString version);
-                        write " .php .phtml\n"))
+        (fn version => (if version = 6
+                        then
+                            (* fastcgi php 5.6 since 6 doesn't exist *)
+                            (write "\tAddHandler fcgid-script .php .phtml\n";
+                             (* FIXME: only set kerberos wrapper of waklog is on *)
+                             write "\n\tFcgidWrapper \"";
+                             write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
+                             write " ";
+                             write Config.Apache.phpFastCgiWrapper;
+                             write "\" .php .phtml\n")
+                        else
+                            (write "\tAddHandler x-httpd-php";
+                             write (Int.toString version);
+                             write " .php .phtml\n")))
 
 val () = Env.action_two "addType"
         ("mime type", Env.string, "extension", Env.string)
@@ -1146,6 +1191,11 @@ val () = Domain.registerDescriber (Domain.considerAll
                                    Domain.Extension {extension = "vhost_ssl",
                                                      heading = fn host => "SSL web vhost " ^ host ^ ":"}])
 
+val () = Env.action_one "allowEncodedSlashes"
+        ("enable", Env.bool)
+        (fn enable => (write "\tAllowEncodedSlashes ";
+                     write (if enable then "NoDecode" else "Off");
+                     write "\n"))
 val () = Env.action_none "testNoHtaccess"
         (fn path => write "\tAllowOverride None\n")