X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e34e1f36399dbe91d9bc52ec0313333dede3c7ad..d300166d083192ef3d4242013adcef345b0126f3:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 54df3d5..be0e4f2 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -89,33 +89,29 @@ fun ssl e = case e of
 
 val dl = ErrorMsg.dummyLoc
 
-val _ = Defaults.registerDefault ("WebNodes",
-				  (TList (TBase "web_node", dl), dl),
-				  (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl)))
-
-val _ = Defaults.registerDefault ("SSL",
-				  (TBase "ssl", dl),
-				  (fn () => (EVar "no_ssl", dl)))
-
-val _ = Defaults.registerDefault ("User",
-				  (TBase "your_user", dl),
-				  (fn () => (EString (Domain.getUser ()), dl)))
-
-val _ = Defaults.registerDefault ("Group",
-				  (TBase "your_group", dl),
-				  (fn () => (EString "nogroup", dl)))
-
-val _ = Defaults.registerDefault ("DocumentRoot",
-				  (TBase "your_path", dl),
-				  (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl)))
-
-val _ = Defaults.registerDefault ("ServerAdmin",
-				  (TBase "email", dl),
-				  (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)))
-
-val _ = Defaults.registerDefault ("SuExec",
-				  (TBase "suexec_flag", dl),
-				  (fn () => (EVar "true", dl)))
+val defaults = [("WebNodes",
+		 (TList (TBase "web_node", dl), dl),
+		 (fn () => (EList (map (fn s => (EString s, dl)) 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)))]
+
+val () = app Defaults.registerDefault defaults
 
 val redirect_code = fn (EVar "temp", _) => SOME "temp"
 		     | (EVar "permanent", _) => SOME "permanent"
@@ -894,4 +890,10 @@ val () = Env.action_two "setEnv"
 val () = Domain.registerResetLocal (fn () =>
 				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
 
+val () = Domain.registerDescriber (Domain.considerAll
+				   [Domain.Extension {extension = "vhost",
+						      heading = fn host => "Web vhost " ^ host},
+				    Domain.Extension {extension = "vhost_ssl",
+						      heading = fn host => "SSL web vhost " ^ host}])
+
 end