Use proper URL prefix in mailmanVhost redirect

[hcoop/domtool2.git] / src / plugins / mailman.sml

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index 4a00074..9f30e72 100644 (file)
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -110,7 +110,11 @@ val () = Env.actionV_one "mailmanVhost"
                                        SOME _ => "443"
                                      | NONE => "80");
                             print ">\n";
-                            print "    ServerName $LISTDOMAIN\n";
+                            print "    ServerName ";
+                            print host;
+                            print ".";
+                            print (Domain.currentDomain ());
+                            print "\n";
                             print "    ServerAdmin ";
                             print user;
                             print "@hcoop.net\n";
@@ -126,7 +130,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";
@@ -183,7 +191,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