Change DefaultAliasSource to $user@hcoop.net, add defaultMailUser extern

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 7286b2e..aebf0f1 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -279,6 +279,10 @@ val _  = Env.registerFunction ("defaultMailbox",
                               fn [] => SOME (EString (getUser ()), dl)
                               | _ => NONE)
 
+val _  = Env.registerFunction ("defaultMailUser",
+                              fn [] => SOME (EString (getUser ()), dl)
+                              | _ => NONE)
+
 
 type soa = {ns : string,
            serial : int option,
@@ -657,7 +661,6 @@ val _ = Env.containerV_one "domain"
 
                                           val slaveIps = map nodeIp (#slaves dns)
                                       in
-                                          app (saveSoa ("slave", #soa dns)) (#slaves dns);
                                           app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
                                           case #master dns of
                                               InternalMaster node =>
@@ -689,7 +692,7 @@ fun handleSite (site, files) =
        
     in
        print ("New configuration for node " ^ site ^ "\n");
-       if site = Config.defaultNode then
+       if site = Config.dispatcherName then
            Slave.handleChanges files
        else let
                val bio = OpenSSL.connect true (valOf (!ssl_context),