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))
SM.empty Config.nodeIps
fun nodeIp node = valOf (SM.find (nodeMap, node))
fn [] => SOME (EString (getUser ()), dl)
| _ => NONE)
+val _ = Env.registerFunction ("defaultMailUser",
+ fn [] => SOME (EString (getUser ()), dl)
+ | _ => NONE)
+
type soa = {ns : string,
serial : int option,
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 =>
in
print ("New configuration for node " ^ site ^ "\n");
- if site = Config.defaultNode then
+ if site = Config.dispatcherName then
Slave.handleChanges files
else let
val bio = OpenSSL.connect true (valOf (!ssl_context),
fun rmdom' delete resultRoot doms =
let
- fun doNode (node, _) =
+ fun doNode (node, _, _) =
let
val dname = OS.Path.joinDirFile {dir = resultRoot,
file = node}
end
handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
- fun cleanupNode (node, _) =
+ fun cleanupNode (node, _, _) =
let
fun doDom dom =
let