Specifying encoding on database creation

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

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index 4a00074..854c91a 100644 (file)
--- 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 "")
@@ -110,10 +111,14 @@ 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";
+                            print sadmin;
+                            print "\n";
                             print "    SuexecUserGroup list list\n";
                             print "\n";
                             print "    ErrorLog ";
@@ -126,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";
@@ -183,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