val ssl_context = ref (NONE : OpenSSL.context option)
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))
fun validNode s = List.exists (fn s' => s = s') nodes
fun yourDomain s = !fakePrivs orelse SS.member (your_domains (), s)
-fun yourUser s = !fakePrivs orelse SS.member (your_users (), s)
-fun yourGroup s = !fakePrivs orelse SS.member (your_groups (), s)
+fun yourUser s = SS.member (your_users (), s)
+fun yourGroup s = SS.member (your_groups (), s)
fun checkPath paths path =
- !fakePrivs orelse
(List.all (fn s => s <> "..") (String.fields (fn ch => ch = #"/") path)
andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"/"
orelse ch = #"-" orelse ch = #"_") path
Env.string
validNode
+val _ = Env.type_one "mime_type"
+ Env.string
+ (CharVector.exists (fn ch => ch = #"/"))
+
val _ = Env.registerFunction ("your_ip_to_ip",
fn [e] => SOME e
| _ => NONE)
[nsD, serialD, refD, retD, expD, minD])
val masterD = (EApp ((EVar "internalMaster", dl),
- (EString Config.masterNode, dl)),
+ (EString Config.Bind.masterNode, dl)),
dl)
-val slavesD = (EList (map (fn s => (EString s, dl)) Config.slaveNodes), dl)
+val slavesD = (EList (map (fn s => (EString s, dl))
+ (List.filter (fn x => List.exists (fn y => y = x) (Config.dnsNodes_all @ Config.dnsNodes_admin)) Config.Bind.slaveNodes)), dl)
val _ = Defaults.registerDefault ("Aliases",
(TList (TBase "your_domain", dl), dl),
fun saveSoa (kind, soa : soa) node =
let
- val {write, writeDom, close} = domainsFile {node = node, name = "soa"}
+ val {write, writeDom, close} = domainsFile {node = node, name = "soa.conf"}
in
write kind;
write "\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),
""
end
-val () = registerDescriber (considerAll [Filename {filename = "soa",
+val () = registerDescriber (considerAll [Filename {filename = "soa.conf",
heading = "DNS SOA:",
showEmpty = false}])
(EString (host ^ "." ^ currentDomain ()), dl))
| (_, args) => Env.badArgs ("domainHost", args))
+val ouc = ref (fn () => ())
+
+fun registerOnUsersChange f =
+ let
+ val f' = !ouc
+ in
+ ouc := (fn () => (f' (); f ()))
+ end
+
+fun onUsersChange () = !ouc ()
+
end