Changing default slaves

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

diff --git a/src/domain.sml b/src/domain.sml
index 15903a2..f2579dd 100644 (file)
--- 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),
                     [nsD, serialD, refD, retD, expD, minD])
 
 val masterD = (EApp ((EVar "internalMaster", dl),

-                    (EString Config.defaultNode, dl)),
+                    (EString Config.masterNode, dl)),

               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)))
 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,
                                  (TBase "dnsKind", dl),
                                  (fn () => multiApp ((EVar "useDns", dl),
                                                      dl,

-                                                     [soaD, masterD, (EList [], dl)])))
+                                                     [soaD, masterD, slavesD])))

 
 val _ = Defaults.registerDefault ("TTL",
                                  (TBase "int", dl),
 
 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)
          | 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 =
              | _ => NONE
 
 datatype dnsKind =