Add AuthGroupFile

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index d53d687..f6017dd 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -167,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
 
@@ -486,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) =
@@ -917,6 +916,13 @@ val () = Env.action_one "authUserFile"
              write name;
              write "\n"))
 
+val () = Env.action_one "authGroupFile"
+        ("file", Env.string)
+        (fn name =>
+            (write "\tAuthGroupFile ";
+             write name;
+             write "\n"))
+
 val () = Env.action_none "requireValidUser"
         (fn () => write "\tRequire valid-user\n")