domain: ipv6 support for nodes, new your_ipv6 type

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

diff --git a/src/domain.sml b/src/domain.sml
index affa1b1..a84a6d8 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -30,9 +30,10 @@ fun set_context ctx = ssl_context := SOME ctx
 fun get_context () = valOf (!ssl_context)
 
 val nodes = map #1 Config.nodeIps
-val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
+val nodeMap = foldl (fn ((node, ip, ipv6), mp) => SM.insert (mp, node, (ip, ipv6)))
                    SM.empty Config.nodeIps
-fun nodeIp node = valOf (SM.find (nodeMap, node))
+fun nodeIp node = #1 (valOf (SM.find (nodeMap, node)))
+fun nodeIpv6 node = #2 (valOf (SM.find (nodeMap, node)))
 
 val usr = ref ""
 fun getUser () = !usr
@@ -54,6 +55,9 @@ fun your_paths () = !your_pths
 val your_ipss = ref SS.empty
 fun your_ips () = !your_ipss
 
+val your_ipv6ss = ref SS.empty
+fun your_ipv6s () = !your_ipv6ss
+
 val world_readable = SS.addList (SS.empty, Config.worldReadable)
 val readable_pths = ref world_readable
 fun readable_paths () = !readable_pths
@@ -76,7 +80,9 @@ fun setUser user =
        your_pths := your_paths;
        readable_pths := SS.union (your_paths, world_readable);
        your_ipss := Acl.class {user = getUser (),
-                               class = "ip"}
+                               class = "ip"};
+       your_ipv6ss := Acl.class {user = getUser (),
+                               class = "ipv6"}
     end
 
 fun declareClient () = isClient := true
@@ -147,6 +153,7 @@ val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
 
 fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
+fun yourIpv6 s = !fakePrivs orelse SS.member (your_ipv6s (), s)
 
 fun yourDomainHost s =
     !fakePrivs
@@ -236,6 +243,10 @@ val _ = Env.type_one "your_ip"
        Env.string
        yourIp
 
+val _ = Env.type_one "your_ipv6"
+       Env.string
+       yourIpv6
+
 val _ = Env.type_one "node"
        Env.string
        validNode
@@ -248,6 +259,10 @@ val _ = Env.registerFunction ("your_ip_to_ip",
                              fn [e] => SOME e
                               | _ => NONE)
 
+val _ = Env.registerFunction ("your_ipv6_to_ipv6",
+                             fn [e] => SOME e
+                              | _ => NONE)
+
 val _ = Env.registerFunction ("dns_node_to_node",
                              fn [e] => SOME e
                               | _ => NONE)
@@ -279,6 +294,10 @@ val _  = Env.registerFunction ("defaultMailbox",
                               fn [] => SOME (EString (getUser ()), dl)
                               | _ => NONE)
 
+val _  = Env.registerFunction ("defaultMailUser",
+                              fn [] => SOME (EString (getUser ()), dl)
+                              | _ => NONE)
+
 
 type soa = {ns : string,
            serial : int option,
@@ -321,6 +340,10 @@ val _ = Env.registerFunction ("ip_of_node",
                              fn [(EString node, _)] => SOME (EString (nodeIp node), dl)
                               | _ => NONE)
 
+val _ = Env.registerFunction ("ipv6_of_node",
+                             fn [(EString node, _)] => SOME (EString (nodeIpv6 node), dl)
+                              | _ => NONE)
+
 val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
              | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
              | _ => NONE
@@ -657,7 +680,6 @@ val _ = Env.containerV_one "domain"
 
                                           val slaveIps = map nodeIp (#slaves dns)
                                       in
-                                          app (saveSoa ("slave", #soa dns)) (#slaves dns);
                                           app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
                                           case #master dns of
                                               InternalMaster node =>
@@ -791,7 +813,7 @@ val _ = Env.type_one "mail_node"
 
 fun rmdom' delete resultRoot doms =
     let
-       fun doNode (node, _) =
+       fun doNode (node, _, _) =
            let
                val dname = OS.Path.joinDirFile {dir = resultRoot,
                                                 file = node}
@@ -840,7 +862,7 @@ fun rmdom' delete resultRoot doms =
            end
                handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
 
-       fun cleanupNode (node, _) =
+       fun cleanupNode (node, _, _) =
            let
                fun doDom dom =
                    let