X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/aa56e112996b3650e8ac343831322d2a9ab0de54..976657583f419a6a204400ea90f9758d15243acb:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 2d566a3..15903a2 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -20,9 +20,14 @@
 
 structure Domain :> DOMAIN = struct
 
+open MsgTypes
+
 structure SM = DataStructures.StringMap
 structure SS = DataStructures.StringSet
 
+val ssl_context = ref (NONE : OpenSSL.context option)
+fun set_context ctx = ssl_context := SOME ctx
+
 val nodes = map #1 Config.nodeIps
 val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
 		    SM.empty Config.nodeIps
@@ -44,7 +49,7 @@ val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
 fun setUser user =
-    (usr := Config.testUser;
+    (usr := user;
      your_doms := Acl.class {user = getUser (),
 			     class = "domain"};
      your_usrs := Acl.class {user = getUser (),
@@ -167,6 +172,10 @@ val masterD = (EApp ((EVar "internalMaster", dl),
 		     (EString Config.defaultNode, dl)),
 	       dl)
 
+val _ = Defaults.registerDefault ("Mailbox",
+				  (TBase "email", dl),
+				  (fn () => (EString (getUser ()), dl)))
+
 val _ = Defaults.registerDefault ("DNS",
 				  (TBase "dnsKind", dl),
 				  (fn () => multiApp ((EVar "useDns", dl),
@@ -212,8 +221,11 @@ datatype master =
 	 ExternalMaster of string
        | InternalMaster of string
 
-val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (Env.string e)
-	      | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
+val ip = fn (EApp ((EVar "ip_of_node", _), e), _) => Option.map nodeIp (Env.string e)
+	  | e => Env.string e
+
+val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
+	      | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (ip e)
 	      | _ => NONE
 
 datatype dnsKind =
@@ -408,8 +420,8 @@ fun findAllDiffs () =
 			    before Posix.FileSys.closedir dir
 			end
 		in
-		    explore (OS.Path.joinDirFile {dir = Config.tmpDir,
-						  file = site}, diffs)
+		    exploreSites (explore (OS.Path.joinDirFile {dir = Config.tmpDir,
+								file = site}, diffs))
 		end
     in
 	exploreSites []
@@ -465,7 +477,7 @@ val _ = Env.containerV_one "domain"
 					   TextIO.output (outf, "\" IN {\n\ttype ");
 					   TextIO.output (outf, kind);
 					   TextIO.output (outf, ";\n\tfile \"");
-					   TextIO.output (outf, Config.Bind.zonePath);
+					   TextIO.output (outf, Config.Bind.zonePath_real);
 					   TextIO.output (outf, "/");
 					   TextIO.output (outf, dom);
 					   TextIO.output (outf, ".zone\";\n");
@@ -545,12 +557,49 @@ val () = Env.registerPost (fn () =>
 			      in
 				  if !ErrorMsg.anyErrors then
 				      ()
-				  else
-				      Slave.handleChanges (map #2 diffs);
+				  else let
+					  val changed = foldl (fn ((site, file), changed) =>
+								  let
+								      val ls = case SM.find (changed, site) of
+										   NONE => []
+										 | SOME ls => ls
+								  in
+								      SM.insert (changed, site, file :: ls)
+								  end) SM.empty diffs
+
+					  fun handleSite (site, files) =
+					      let
+						  
+					      in
+						  print ("New configuration for node " ^ site ^ "\n");
+						  if site = Config.defaultNode then
+						      Slave.handleChanges files
+						  else let
+							  val bio = OpenSSL.connect (valOf (!ssl_context),
+										     nodeIp site
+										     ^ ":"
+										     ^ Int.toString Config.slavePort)
+						      in
+							  app (fn file => Msg.send (bio, MsgFile file)) files;
+							  Msg.send (bio, MsgDoFiles);
+							  case Msg.recv bio of
+							      NONE => print "Slave closed connection unexpectedly\n"
+							    | SOME m =>
+							      case m of
+								  MsgOk => print ("Slave " ^ site ^ " finished\n")
+								| MsgError s => print ("Slave " ^ site
+										       ^ " returned error: " ^
+										       s ^ "\n")
+								| _ => print ("Slave " ^ site
+									      ^ " returned unexpected command\n");
+							  OpenSSL.close bio
+						      end
+					      end
+				      in
+					  SM.appi handleSite changed
+				      end;
 				  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
 						     fn cl => "Temp file cleanup failed: " ^ cl))
 			      end)
 
-
-
 end