From: Adam Chlipala <adamc@hcoop.net>
Date: Sun, 29 Apr 2007 21:17:55 +0000 (+0000)
Subject: Domain alias support for Webalizer
X-Git-Tag: release_2010-11-19~223
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/5cab5a9811e767a649e57b4012fbc19635dae11e?ds=sidebyside

Domain alias support for Webalizer
---

diff --git a/src/main.sml b/src/main.sml
index bea07af..90a0ee4 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -1253,6 +1253,12 @@ fun service () =
 			    OpenSSL.close bio
 			    handle OpenSSL.OpenSSL _ => ();
 			    loop ())
+			 | IO.Io {name, function, cause} =>
+			   (print ("IO error: " ^ function ^ " for " ^ name ^ "\n");
+			    app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory cause);
+			    OpenSSL.close bio
+			    handle OpenSSL.OpenSSL _ => ();
+			    loop ())
 			 | e =>
 			   (print "Unknown exception in main loop!\n";
 			    app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 7e3deb5..e5fe47b 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -462,7 +462,8 @@ val () = Env.containerV_one "vhost"
 		      write cert)
 		   | NONE => ();
 		 write "\n";
-		 !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost}
+		 !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost};
+		 app (fn dom => !aliaser (host ^ "." ^ dom)) (Domain.currentAliasDomains ())
 	     end,
 	  fn () => (!post ();
 		    write "</VirtualHost>\n";