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

diff --git a/src/domain.sml b/src/domain.sml
index 15903a2..85dcd67 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -169,9 +169,11 @@ val soaD = multiApp ((EVar "soa", dl),
 		     [nsD, serialD, refD, retD, expD, minD])
 
 val masterD = (EApp ((EVar "internalMaster", dl),
-		     (EString Config.defaultNode, dl)),
+		     (EString Config.masterNode, dl)),
 	       dl)
 
+val slavesD = (EList (map (fn s => (EString s, dl)) Config.slaveNodes), dl)
+
 val _ = Defaults.registerDefault ("Mailbox",
 				  (TBase "email", dl),
 				  (fn () => (EString (getUser ()), dl)))
@@ -180,7 +182,7 @@ val _ = Defaults.registerDefault ("DNS",
 				  (TBase "dnsKind", dl),
 				  (fn () => multiApp ((EVar "useDns", dl),
 						      dl,
-						      [soaD, masterD, (EList [], dl)])))
+						      [soaD, masterD, slavesD])))
 
 val _ = Defaults.registerDefault ("TTL",
 				  (TBase "int", dl),
@@ -225,7 +227,7 @@ val ip = fn (EApp ((EVar "ip_of_node", _), e), _) => Option.map nodeIp (Env.stri
 	  | 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)
+	      | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
 	      | _ => NONE
 
 datatype dnsKind =
@@ -485,7 +487,7 @@ val _ = Env.containerV_one "domain"
 					       "master" => TextIO.output (outf, "\tallow-update { none; };\n")
 					     | _ => (TextIO.output (outf, "\tmasters { ");
 						     TextIO.output (outf, masterIp);
-						     TextIO.output (outf, " };\n"));
+						     TextIO.output (outf, "; };\n"));
 					   TextIO.output (outf, "};\n");
 					   TextIO.closeOut outf
 				       end