merge toplevel-dynamic-environment

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index d53d687..35bd070 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -144,32 +144,9 @@ 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))),
-               ("SSL",
-                (TBase "ssl", dl),
-                (fn () => (EVar "no_ssl", dl))),
-               ("User",
-                (TBase "your_user", dl),
-                (fn () => (EString (Domain.getUser ()), dl))),
-               ("Group",
-                (TBase "your_group", dl),
-                (fn () => (EString "nogroup", dl))),
-               ("DocumentRoot",
-                (TBase "your_path", dl),
-                (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl))),
-               ("ServerAdmin",
-                (TBase "email", dl),
-                (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl))),
-               ("SuExec",
-                (TBase "suexec_flag", dl),
-                (fn () => (EVar "true", dl))),
-               ("PhpVersion",
-                (TBase "php_version", dl),
-                (fn () => (EVar "php4", dl)))]
-
-val () = app Defaults.registerDefault defaults
+val _ = Env.registerFunction ("defaultServerAdmin",
+                             fn [] => SOME (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)
+                             | _ => NONE)
 
 val redirect_code = fn (EVar "temp", _) => SOME "temp"
                     | (EVar "permanent", _) => SOME "permanent"
@@ -486,8 +463,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 +893,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")