ip_of_node support

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

diff --git a/src/domain.sml b/src/domain.sml
index f22c73b..15903a2 100644 (file)
--- 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 =
 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 (),
      your_doms := Acl.class {user = getUser (),
                             class = "domain"};
      your_usrs := Acl.class {user = getUser (),


@@ -221,8 +221,11 @@ datatype master =
         ExternalMaster of string
        | InternalMaster of string
 
         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 =
              | _ => NONE
 
 datatype dnsKind =