X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/3af11fe69bf5f83cf12f5a37855faa8c81025b34..fd53df8fe8e39d722b7562c4e9d68ab4d7937577:/src/plugins/mailman.sml

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index b716cbd..854c91a 100644
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -87,6 +87,7 @@ val () = Env.actionV_one "mailmanVhost"
 
 		 val ssl = Env.env Apache.ssl (env, "SSL")
 		 val user = Env.env Env.string (env, "User")
+		 val sadmin = Env.env Env.string (env, "ServerAdmin")
 
 		 val fullHost = host ^ "." ^ Domain.currentDomain ()
 		 val vhostId = fullHost ^ (if Option.isSome ssl then ".ssl" else "")
@@ -116,8 +117,8 @@ val () = Env.actionV_one "mailmanVhost"
 			     print (Domain.currentDomain ());
 			     print "\n";
 			     print "    ServerAdmin ";
-			     print user;
-			     print "@hcoop.net\n";
+			     print sadmin;
+			     print "\n";
 			     print "    SuexecUserGroup list list\n";
 			     print "\n";
 			     print "    ErrorLog ";
@@ -130,7 +131,11 @@ val () = Env.actionV_one "mailmanVhost"
 			     print "    RewriteEngine on\n";
 			     print "\n";
 			     print "    # Default to showing listinfo page\n";
-			     print "    RewriteRule ^/$ http://";
+			     print "    RewriteRule ^/$ http";
+			     case ssl of
+				 NONE => ()
+			       | SOME _ => print "s";
+			     print "://";
 			     print fullHost;
 			     print "/listinfo/\n";
 			     print "\n";
@@ -187,7 +192,7 @@ val () = Slave.registerPostHandler (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Filename {filename = "mailman",
-						     heading = "Mailman web host mapping",
+						     heading = "Mailman web host mapping:",
 						     showEmpty = false}])
 
 end