X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/36e42cb86393a7b9e333ecd7edfbdd16c7d9a1ac..976657583f419a6a204400ea90f9758d15243acb:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 38993a2..15903a2 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -49,7 +49,7 @@ val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
 fun setUser user =
-    (usr := Config.testUser;
+    (usr := user;
      your_doms := Acl.class {user = getUser (),
 			     class = "domain"};
      your_usrs := Acl.class {user = getUser (),
@@ -172,6 +172,10 @@ val masterD = (EApp ((EVar "internalMaster", dl),
 		     (EString Config.defaultNode, dl)),
 	       dl)
 
+val _ = Defaults.registerDefault ("Mailbox",
+				  (TBase "email", dl),
+				  (fn () => (EString (getUser ()), dl)))
+
 val _ = Defaults.registerDefault ("DNS",
 				  (TBase "dnsKind", dl),
 				  (fn () => multiApp ((EVar "useDns", dl),
@@ -217,8 +221,11 @@ datatype master =
 	 ExternalMaster of string
        | InternalMaster of string
 
-val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (Env.string e)
-	      | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
+val ip = fn (EApp ((EVar "ip_of_node", _), e), _) => Option.map nodeIp (Env.string e)
+	  | e => Env.string e
+
+val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
+	      | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (ip e)
 	      | _ => NONE
 
 datatype dnsKind =
@@ -470,7 +477,7 @@ val _ = Env.containerV_one "domain"
 					   TextIO.output (outf, "\" IN {\n\ttype ");
 					   TextIO.output (outf, kind);
 					   TextIO.output (outf, ";\n\tfile \"");
-					   TextIO.output (outf, Config.Bind.zonePath);
+					   TextIO.output (outf, Config.Bind.zonePath_real);
 					   TextIO.output (outf, "/");
 					   TextIO.output (outf, dom);
 					   TextIO.output (outf, ".zone\";\n");