merge toplevel-dynamic-environment

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

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index 854c91a..ef0a82f 100644 (file)
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -42,8 +42,6 @@ fun mailmanPlace (EApp ((EVar "mailman_place_default", _), (EString node, _)), _
     SOME (node, ip)
   | mailmanPlace _ = NONE
 
-fun mailmanPlaceDefault node = (EApp ((EVar "mailman_place_default", dl), (EString node, dl)), dl)
-
 val _ = Env.registerFunction ("mailman_place_to_web_node",
                              fn [e] => Option.map (fn (node, _) => (EString node, dl)) (mailmanPlace e)
                               | _ => NONE)
@@ -56,11 +54,6 @@ val _ = Env.registerFunction ("mailman_place_to_ip",
                              fn [e] => Option.map (fn (_, ip) => (EString ip, dl)) (mailmanPlace e)
                               | _ => NONE)
 
-val () = Defaults.registerDefault
-            ("MailmanPlaces",
-             (TList (TBase "mailman_place", dl), dl),
-             (fn () => (EList [mailmanPlaceDefault Config.Mailman.node], dl)))
-
 val files = ref ([] : TextIO.outstream list)
 val write = ref (fn _ : string => ())
 
@@ -69,7 +62,7 @@ val () = Env.action_one "mailmanWebHost"
                        (fn host =>
                            let
                                val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node,
-                                                                                  name = "mailman"}
+                                                                                  name = "mailman.conf"}
                            in
                                write "\t'";
                                write host;
@@ -175,15 +168,15 @@ val () = Slave.registerFileHandler (fn fs =>
                                           val spl = OS.Path.splitDirFile (#file fs)
                                       in
                                           case #file spl of
-                                              "mailman" => mailmanChanged := true
+                                              "mailman.conf" => mailmanChanged := true
                                             | _ => ()
                                       end)
 
 val () = Slave.registerPostHandler (fn () =>
                                       if !mailmanChanged then
-                                          (Slave.concatTo (fn s => s = "mailman")
+                                          (Slave.concatTo (fn s => s = "mailman.conf")
                                                           Config.Mailman.mapFile;
-                                           Slave.enumerateTo (fn s => s = "mailman") ":"
+                                           Slave.enumerateTo (fn s => s = "mailman.conf") ":"
                                                              Config.Mailman.handleDomains;
                                                              Slave.shellF ([Config.Mailman.reload],
                                                       fn cl => "Error reloading Mailman with " ^ cl))
@@ -191,7 +184,7 @@ val () = Slave.registerPostHandler (fn () =>
                                           ())
 
 val () = Domain.registerDescriber (Domain.considerAll
-                                  [Domain.Filename {filename = "mailman",
+                                  [Domain.Filename {filename = "mailman.conf",
                                                     heading = "Mailman web host mapping:",
                                                     showEmpty = false}])