Allow all users to use "nogroup" as `your_group'

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

diff --git a/src/domain.sml b/src/domain.sml
index 82367ce..3e212a2 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -70,8 +70,9 @@ fun setUser user =
                                class = "domain"};
        your_usrs := Acl.class {user = getUser (),
                                class = "user"};
-       your_grps := Acl.class {user = getUser (),
-                               class = "group"};
+       your_grps := SS.add (Acl.class {user = getUser (),
+                                       class = "group"},
+                            "nogroup");
        your_pths := your_paths;
        readable_pths := SS.union (your_paths, world_readable);
        your_ipss := Acl.class {user = getUser (),
@@ -267,41 +268,14 @@ val _ = Env.registerFunction ("end_in_slash",
                               | _ => NONE)
 
 
-val nsD = (EString Config.defaultNs, dl)
-val serialD = (EVar "serialAuto", dl)
-val refD = (EInt Config.defaultRefresh, dl)
-val retD = (EInt Config.defaultRetry, dl)
-val expD = (EInt Config.defaultExpiry, dl)
-val minD = (EInt Config.defaultMinimum, dl)
+val _ = Env.registerFunction ("you",
+                             fn [] => SOME (EString (getUser ()), dl)
+                             | _ => NONE)
 
-val soaD = multiApp ((EVar "soa", dl),
-                    dl,
-                    [nsD, serialD, refD, retD, expD, minD])
-
-val masterD = (EApp ((EVar "internalMaster", dl),
-                    (EString Config.masterNode, dl)),
-              dl)
-
-val slavesD = (EList (map (fn s => (EString s, dl))
-                         (List.filter (fn x => List.exists (fn y => y = x) (Config.dnsNodes_all @ Config.dnsNodes_admin)) Config.slaveNodes)), dl)
-
-val _ = Defaults.registerDefault ("Aliases",
-                                 (TList (TBase "your_domain", dl), dl),
-                                 (fn () => (EList [], dl)))
-
-val _ = Defaults.registerDefault ("Mailbox",
-                                 (TBase "email", dl),
-                                 (fn () => (EString (getUser ()), dl)))
-
-val _ = Defaults.registerDefault ("DNS",
-                                 (TBase "dnsKind", dl),
-                                 (fn () => multiApp ((EVar "useDns", dl),
-                                                     dl,
-                                                     [soaD, masterD, slavesD])))
+val _  = Env.registerFunction ("defaultMailbox",
+                              fn [] => SOME (EString (getUser ()), dl)
+                              | _ => NONE)
 
-val _ = Defaults.registerDefault ("TTL",
-                                 (TBase "int", dl),
-                                 (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
            serial : int option,