domain: add node ipv6 address to nodeMap

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

diff --git a/src/domain.sml b/src/domain.sml
index aebf0f1..85781a8 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
@@ -794,7 +795,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}
@@ -843,7 +844,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