Remove php4 support Good riddance

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index adc579e..52470c8 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
  * Copyright (c) 2006-2009, Adam Chlipala
+ * Copyright (c) 2013 Clinton Ebadi
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -68,18 +69,22 @@ val _ = Env.type_one "proxy_target"
                fun default () = List.exists (fn s' => s = s') Config.Apache.proxyTargets
            in
                case String.fields (fn ch => ch = #":") s of
-                   "http" :: "//localhost" :: rest =>
+                   "http" :: host :: rest =>
                    let
                        val rest = String.concatWith ":" rest
                    in
-                       CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
-                                                andalso ch <> #"\"" andalso ch <> #"'") rest
-                       andalso case String.fields (fn ch => ch = #"/") rest of
-                                   port :: _ =>
-                                   (case Int.fromString port of
-                                        NONE => default ()
-                                      | SOME n => n > 1024 orelse default ())
-                                 | _ => default ()
+                       if List.exists (fn h' => host = h') (map (fn h => String.concat ["//", h]) Config.Apache.proxyHosts)
+                       then
+                           CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
+                                                    andalso ch <> #"\"" andalso ch <> #"'") rest
+                           andalso case String.fields (fn ch => ch = #"/") rest of
+                                       port :: _ =>
+                                       (case Int.fromString port of
+                                            NONE => default ()
+                                          | SOME n => n > 1024 orelse default ())
+                                     | _ => default ()
+                       else
+                           default ()
                    end
                  | _ => default ()
            end)
@@ -113,10 +118,18 @@ fun validCert s = Acl.query {user = Domain.getUser (),
                             class = "cert",
                             value = s}
 
+fun validCaCert s = Acl.query {user = Domain.getUser (),
+                              class = "cacert",
+                              value = s}
+
 val _ = Env.type_one "ssl_cert_path"
        Env.string
        validCert
 
+val _ = Env.type_one "ssl_cacert_path"
+       Env.string
+       validCaCert
+
 fun ssl e = case e of
                (EVar "no_ssl", _) => SOME NONE
              | (EApp ((EVar "use_cert", _), s), _) => Option.map SOME (Env.string s)
@@ -154,7 +167,7 @@ val defaults = [("WebPlaces",
                 (fn () => (EVar "true", dl))),
                ("PhpVersion",
                 (TBase "php_version", dl),
-                (fn () => (EVar "php4", dl)))]
+                (fn () => (EVar "php5", dl)))]
 
 val () = app Defaults.registerDefault defaults
 
@@ -202,6 +215,7 @@ val apache_option = fn (EVar "execCGI", _) => SOME "ExecCGI"
                     | (EVar "includesNOEXEC", _) => SOME "IncludesNOEXEC"
                     | (EVar "indexes", _) => SOME "Indexes"
                     | (EVar "followSymLinks", _) => SOME "FollowSymLinks"
+                    | (EVar "multiViews", _) => SOME "MultiViews"
                     | _ => NONE
 
 val autoindex_width = fn (EVar "autofit", _) => SOME "*"
@@ -472,8 +486,7 @@ fun vhostPost () = (!post ();
                    write "</VirtualHost>\n";
                    app (TextIO.closeOut o #2) (!vhostFiles))
 
-val php_version = fn (EVar "php4", _) => SOME 4
-                  | (EVar "php5", _) => SOME 5
+val php_version = fn (EVar "php5", _) => SOME 5
                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
@@ -1121,6 +1134,16 @@ val () = Env.action_two "addOutputFilter"
              write "\n")
           | _ => ())
 
+val () = Env.action_one "sslCertificateChainFile"
+        ("ssl_cacert_path", Env.string)
+        (fn cacert =>
+            if !sslEnabled then
+                (write "\tSSLCertificateChainFile \"";
+                 write cacert;
+                 write "\"\n")
+            else
+                print "WARNING: Skipped sslCertificateChainFile because this isn't an SSL vhost.\n")
+
 val () = Domain.registerResetLocal (fn () =>
                                       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))