X-Git-Url: http://git.hcoop.net/clinton/domtool2.git/blobdiff_plain/04502362ef40024052b18473028f8b53919ead15..d08b9cf26fd841b6ac665ae0eba83d69f53a809c:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index f31d704..2bcfe15 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -27,6 +27,7 @@ structure SS = DataStructures.StringSet
 
 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))
@@ -132,10 +133,9 @@ fun validDomain s =
 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
@@ -236,6 +236,10 @@ val _ = Env.type_one "node"
 	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)
@@ -263,40 +267,14 @@ val _ = Env.registerFunction ("end_in_slash",
 			       | _ => NONE)
 
 
-val nsD = (EString Config.defaultNs, dl)
-val serialD = (EVar "serialAuto", dl)
-val refD = (EInt Config.defaultRefresh, dl)
-val retD = (EInt Config.defaultRetry, dl)
-val expD = (EInt Config.defaultExpiry, dl)
-val minD = (EInt Config.defaultMinimum, dl)
-
-val soaD = multiApp ((EVar "soa", dl),
-		     dl,
-		     [nsD, serialD, refD, retD, expD, minD])
-
-val masterD = (EApp ((EVar "internalMaster", dl),
-		     (EString Config.masterNode, dl)),
-	       dl)
-
-val slavesD = (EList (map (fn s => (EString s, dl)) Config.slaveNodes), dl)
-
-val _ = Defaults.registerDefault ("Aliases",
-				  (TList (TBase "your_domain", dl), dl),
-				  (fn () => (EList [], dl)))
-
-val _ = Defaults.registerDefault ("Mailbox",
-				  (TBase "email", dl),
-				  (fn () => (EString (getUser ()), dl)))
+val _ = Env.registerFunction ("you",
+			      fn [] => SOME (EString (getUser ()), dl)
+			      | _ => NONE)
 
-val _ = Defaults.registerDefault ("DNS",
-				  (TBase "dnsKind", dl),
-				  (fn () => multiApp ((EVar "useDns", dl),
-						      dl,
-						      [soaD, masterD, slavesD])))
+val _  = Env.registerFunction ("defaultMailbox",
+			       fn [] => SOME (EString (getUser ()), dl)
+			       | _ => NONE)
 
-val _ = Defaults.registerDefault ("TTL",
-				  (TBase "int", dl),
-				  (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
 	    serial : int option,
@@ -610,7 +588,7 @@ val _ = Env.containerV_one "domain"
 
 				   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";
@@ -980,7 +958,7 @@ fun considerAll ds {node, domain} =
 	    ""
     end
 
-val () = registerDescriber (considerAll [Filename {filename = "soa",
+val () = registerDescriber (considerAll [Filename {filename = "soa.conf",
 						   heading = "DNS SOA:",
 						   showEmpty = false}])
 
@@ -990,4 +968,15 @@ val () = Env.registerAction ("domainHost",
 					   (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