HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic internal ipv6 support
[hcoop/domtool2.git]
/
src
/
domain.sml
diff --git
a/src/domain.sml
b/src/domain.sml
index
7286b2e
..
90afaad
100644
(file)
--- a/
src/domain.sml
+++ b/
src/domain.sml
@@
-30,7
+30,7
@@
fun set_context ctx = ssl_context := SOME ctx
fun get_context () = valOf (!ssl_context)
val nodes = map #1 Config.nodeIps
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))
SM.empty Config.nodeIps
fun nodeIp node = valOf (SM.find (nodeMap, node))
@@
-279,6
+279,10
@@
val _ = Env.registerFunction ("defaultMailbox",
fn [] => SOME (EString (getUser ()), dl)
| _ => NONE)
fn [] => SOME (EString (getUser ()), dl)
| _ => NONE)
+val _ = Env.registerFunction ("defaultMailUser",
+ fn [] => SOME (EString (getUser ()), dl)
+ | _ => NONE)
+
type soa = {ns : string,
serial : int option,
type soa = {ns : string,
serial : int option,
@@
-657,7
+661,6
@@
val _ = Env.containerV_one "domain"
val slaveIps = map nodeIp (#slaves dns)
in
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 =>
app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
case #master dns of
InternalMaster node =>
@@
-689,7
+692,7
@@
fun handleSite (site, files) =
in
print ("New configuration for node " ^ site ^ "\n");
in
print ("New configuration for node " ^ site ^ "\n");
- if site = Config.d
efaultNod
e then
+ if site = Config.d
ispatcherNam
e then
Slave.handleChanges files
else let
val bio = OpenSSL.connect true (valOf (!ssl_context),
Slave.handleChanges files
else let
val bio = OpenSSL.connect true (valOf (!ssl_context),
@@
-791,7
+794,7
@@
val _ = Env.type_one "mail_node"
fun rmdom' delete resultRoot doms =
let
fun rmdom' delete resultRoot doms =
let
- fun doNode (node, _) =
+ fun doNode (node, _
, _
) =
let
val dname = OS.Path.joinDirFile {dir = resultRoot,
file = node}
let
val dname = OS.Path.joinDirFile {dir = resultRoot,
file = node}
@@
-840,7
+843,7
@@
fun rmdom' delete resultRoot doms =
end
handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
end
handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
- fun cleanupNode (node, _) =
+ fun cleanupNode (node, _
, _
) =
let
fun doDom dom =
let
let
fun doDom dom =
let