X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1638d5a206cd79e9619f0d3334fed29eaddc6b51..2e87719caa8c0cc98c573a2071a3c9c7cd503632:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 064aa3e..3998b83 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -48,8 +48,11 @@ fun your_groups () = !your_grps
 val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
+val your_ipss = ref SS.empty
+fun your_ips () = !your_ipss
+
 val world_readable = SS.addList (SS.empty, Config.worldReadable)
-val readable_pths = ref SS.empty
+val readable_pths = ref world_readable
 fun readable_paths () = !readable_pths
 
 fun setUser user =
@@ -66,7 +69,9 @@ fun setUser user =
 	your_grps := Acl.class {user = getUser (),
 				class = "group"};
 	your_pths := your_paths;
-	readable_pths := SS.union (your_paths, world_readable)
+	readable_pths := SS.union (your_paths, world_readable);
+	your_ipss := Acl.class {user = getUser (),
+				class = "ip"}
     end
 
 fun validIp s =
@@ -97,6 +102,7 @@ fun checkPath paths path =
     andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (paths ())
 val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
+fun yourIp s = SS.member (your_ips (), s)
 
 fun yourDomainHost s =
     yourDomain s
@@ -177,10 +183,18 @@ val _ = Env.type_one "readable_path"
 	Env.string
 	readablePath
 
+val _ = Env.type_one "your_ip"
+	Env.string
+	yourIp
+
 val _ = Env.type_one "node"
 	Env.string
 	validNode
 
+val _ = Env.registerFunction ("your_ip_to_ip",
+			      fn [e] => SOME e
+			       | _ => NONE)
+
 val _ = Env.registerFunction ("dns_node_to_node",
 			      fn [e] => SOME e
 			       | _ => NONE)
@@ -403,7 +417,7 @@ datatype file_action' =
        | Delete' of string
        | Modify' of {src : string, dst : string}
 
-fun findDiffs (site, dom, acts) =
+fun findDiffs (prefixes, site, dom, acts) =
     let
 	val gp = getPath dom
 	val realPath = gp (Config.resultRoot, site)
@@ -431,8 +445,10 @@ fun findDiffs (site, dom, acts) =
 			    loopReal acts
 			else
 			    loopReal ((site, dom, realPath, Modify' {src = tmp, dst = real}) :: acts)
-		    else
+		    else if List.exists (fn prefix => String.isPrefix prefix real) prefixes then
 			loopReal ((site, dom, realPath, Delete' real) :: acts)
+		    else
+			loopReal acts
 		end
 
 	val acts = loopReal acts
@@ -463,7 +479,7 @@ fun findDiffs (site, dom, acts) =
 	acts
     end
 
-fun findAllDiffs () =
+fun findAllDiffs prefixes =
     let
 	val dir = Posix.FileSys.opendir Config.tmpDir
 	val len = length (String.fields (fn ch => ch = #"/") Config.tmpDir) + 1
@@ -495,7 +511,7 @@ fun findAllDiffs () =
 											file = name}
 						  in
 						      explore (dname',
-							       findDiffs (site, dom, diffs))
+							       findDiffs (prefixes, site, dom, diffs))
 						  end
 					      else
 						  diffs)
@@ -516,10 +532,14 @@ fun findAllDiffs () =
 val masterNode : string option ref = ref NONE
 fun dnsMaster () = !masterNode
 
+val seenDomains : string list ref = ref []
+
 val _ = Env.containerV_one "domain"
 			   ("domain", Env.string)
 			   (fn (evs, dom) =>
 			       let
+				   val () = seenDomains := dom :: !seenDomains
+
 				   val kind = Env.env dnsKind (evs, "DNS")
 				   val ttl = Env.env Env.int (evs, "TTL")
 				   val aliases = Env.env (Env.list Env.string) (evs, "Aliases")
@@ -608,7 +628,8 @@ val _ = Env.containerV_one "domain"
 			       end,
 			    fn () => !afters (!current))
 
-val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
+val () = Env.registerPre (fn () => (seenDomains := [];
+				    ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
 						       fn cl => "Temp file cleanup failed: " ^ cl));
 				    OS.FileSys.mkDir Config.tmpDir;
 				    app (fn node => OS.FileSys.mkDir
@@ -652,7 +673,18 @@ fun handleSite (site, files) =
 
 val () = Env.registerPost (fn () =>
 			      let
-				  val diffs = findAllDiffs ()
+				  val prefixes = List.concat
+						     (List.map (fn dom =>
+								   let
+								       val pieces = String.tokens (fn ch => ch = #".") dom
+								       val path = String.concatWith "/" (rev pieces)
+								   in
+								       List.map (fn node =>
+										    Config.resultRoot ^ "/" ^ node ^ "/" ^ path ^ "/")
+										nodes
+								   end) (!seenDomains))
+								  
+				  val diffs = findAllDiffs prefixes
 
 				  val diffs = map (fn (site, dom, dir, Add' {src, dst}) =>
 						      (Slave.shellF ([Config.cp, " ", src, " ", dst],
@@ -744,11 +776,10 @@ fun rmdom' delete resultRoot doms =
 								fnameFull,
 								actions))
 					    else			
-						(print ("Kill " ^ fnameFull ^ "\n");
 						 loop ({action = Slave.Delete delete,
 							domain = dom,
 							dir = dname,
-							file = fnameFull} :: actions))
+							file = fnameFull} :: actions)
 					end
 			    in
 				loop actions
@@ -893,4 +924,10 @@ val () = registerDescriber (considerAll [Filename {filename = "soa",
 						   heading = "DNS SOA",
 						   showEmpty = false}])
 
+val () = Env.registerAction ("domainHost",
+			     fn (env, [(EString host, _)]) =>
+				SM.insert (env, "Hostname",
+					   (EString (host ^ "." ^ currentDomain ()), dl))
+			      | (_, args) => Env.badArgs ("domainHost", args))
+
 end