X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/19f3c4e664808d8dafabd9674635d9069bafd7cb..aa56e112996b3650e8ac343831322d2a9ab0de54:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 27bc806..2d566a3 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -29,7 +29,6 @@ val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
 fun nodeIp node = valOf (SM.find (nodeMap, node))
 
 val usr = ref ""
-fun setUser ur = usr := ur
 fun getUser () = !usr
 
 val your_doms = ref SS.empty
@@ -44,6 +43,17 @@ fun your_groups () = !your_grps
 val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
+fun setUser user =
+    (usr := Config.testUser;
+     your_doms := Acl.class {user = getUser (),
+			     class = "domain"};
+     your_usrs := Acl.class {user = getUser (),
+			     class = "user"};
+     your_grps := Acl.class {user = getUser (),
+			     class = "group"};
+     your_pths := Acl.class {user = getUser (),
+			     class = "path"})
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
 	[SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -157,15 +167,15 @@ val masterD = (EApp ((EVar "internalMaster", dl),
 		     (EString Config.defaultNode, dl)),
 	       dl)
 
-val _ = Main.registerDefault ("DNS",
-			      (TBase "dnsKind", dl),
-			      (fn () => multiApp ((EVar "useDns", dl),
-					 dl,
-					 [soaD, masterD, (EList [], dl)])))
+val _ = Defaults.registerDefault ("DNS",
+				  (TBase "dnsKind", dl),
+				  (fn () => multiApp ((EVar "useDns", dl),
+						      dl,
+						      [soaD, masterD, (EList [], dl)])))
 
-val _ = Main.registerDefault ("TTL",
-			      (TBase "int", dl),
-			      (fn () => (EInt Config.Bind.defaultTTL, dl)))
+val _ = Defaults.registerDefault ("TTL",
+				  (TBase "int", dl),
+				  (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
 	    serial : int option,
@@ -490,17 +500,6 @@ val _ = Env.containerV_one "domain"
 			       end,
 			    fn () => !afters (!current))
 
-val () = Env.registerPreTycheck (fn () => (setUser Config.testUser;
-					   Acl.read Config.aclFile;
-					   your_doms := Acl.class {user = getUser (),
-								   class = "domain"};
-					   your_usrs := Acl.class {user = getUser (),
-								   class = "user"};
-					   your_grps := Acl.class {user = getUser (),
-								   class = "group"};
-					   your_pths := Acl.class {user = getUser (),
-								   class = "path"}))
-
 val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
 						       fn cl => "Temp file cleanup failed: " ^ cl));
 				    OS.FileSys.mkDir Config.tmpDir;