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 b5edd64..52470c8 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -118,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)
@@ -159,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
 
@@ -478,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) =
@@ -1127,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/*")))