summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b3f18c3)
defaultNode was punned to dispatcherName, and dispatcher relied on
other values in the file. I.e. you had to set all three to change the
dispatcher! Consolidate all into dispatcherName.
val defaultMinimum = 3600
val nodeIps = [("deleuze", "69.90.123.67"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192")]
val defaultMinimum = 3600
val nodeIps = [("deleuze", "69.90.123.67"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("navajos", "69.90.123.70"), ("bog", "69.90.123.72"), ("outpost", "151.236.216.192")]
-val defaultNode = "fritz"
+val dispatcherName = "fritz"
val dnsNodes_all = ["deleuze", "outpost"]
val dnsNodes_admin = []
val dnsNodes_all = ["deleuze", "outpost"]
val dnsNodes_admin = []
val defaultDomain = "hcoop.net"
val defaultDomain = "hcoop.net"
-val dispatcher = defaultNode ^ "." ^ defaultDomain
val dispatcherPort = 1234
val slavePort = 1235
val queueSize = 5
val dispatcherPort = 1234
val slavePort = 1235
val queueSize = 5
val keyDir = ConfigCore.sharedRoot ^ "/keys"
val caDir = "/etc/domtool/ca"
val keyDir = ConfigCore.sharedRoot ^ "/keys"
val caDir = "/etc/domtool/ca"
-val dispatcherName = defaultNode
-
fun domtoolDir user =
case user of
"domtool" => ConfigCore.sharedRoot ^ "/.domtool"
fun domtoolDir user =
case user of
"domtool" => ConfigCore.sharedRoot ^ "/.domtool"
(* Names of machines who will receive configuration *)
val nodeIps : (string * string) list
(* Names of machines who will receive configuration *)
val nodeIps : (string * string) list
-val defaultNode : string
+val dispatcherName : string
val aclFile : string
(* Place to serialize ACL information *)
val aclFile : string
(* Place to serialize ACL information *)
val defaultDomain : string
val defaultDomain : string
val dispatcherPort : int
val slavePort : int
val queueSize : int
val dispatcherPort : int
val slavePort : int
val queueSize : int
val keyDir : string
val caDir : string
val keyDir : string
val caDir : string
-val dispatcherName : string
-
val dnsNodes_all : string list
val dnsNodes_admin : string list
val dnsNodes_all : string list
val dnsNodes_admin : string list
in
print ("New configuration for node " ^ site ^ "\n");
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),
Slave.handleChanges files
else let
val bio = OpenSSL.connect true (valOf (!ssl_context),
let
fun doNode (site, ok) =
(print ("New vmail data for node " ^ site ^ "\n");
let
fun doNode (site, ok) =
(print ("New vmail data for node " ^ site ^ "\n");
- if site = Config.defaultNode then
+ if site = Config.dispatcherName then
Slave.shell [Config.Courier.postReload] andalso ok
else let
val bio = OpenSSL.connect true (Domain.get_context (),
Slave.shell [Config.Courier.postReload] andalso ok
else let
val bio = OpenSSL.connect true (Domain.get_context (),
| (G, NONE) => (G, evs)
val dispatcher =
| (G, NONE) => (G, evs)
val dispatcher =
- Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
+ Domain.nodeIp Config.dispatcherName ^ ":" ^ Int.toString Config.dispatcherPort
val self =
"localhost:" ^ Int.toString Config.slavePort
val self =
"localhost:" ^ Int.toString Config.slavePort
val ok = ref true
fun contactNode (node, ip) =
val ok = ref true
fun contactNode (node, ip) =
- if node = Config.defaultNode then
+ if node = Config.dispatcherName then
Domain.resetLocal ()
else let
val bio = OpenSSL.connect true (context,
Domain.resetLocal ()
else let
val bio = OpenSSL.connect true (context,