ServerAdmin env var for mailmanVhost

diff --git a/lib/mailman.dtl b/lib/mailman.dtl
index 2e8029e..31cb02e 100644 (file)
--- a/lib/mailman.dtl
+++ b/lib/mailman.dtl
@@ -24,7 +24,8 @@ extern val mailman_place_to_ip : mailman_place -> ip;
 extern val mailmanVhost : host -> [Domain]
        {MailmanPlaces : [mailman_place],
         SSL : ssl,
 extern val mailmanVhost : host -> [Domain]
        {MailmanPlaces : [mailman_place],
         SSL : ssl,

-        User : your_user};
+        User : your_user,
+         ServerAdmin : email};

 {{Create an Apache virtual host to serve as the web interface for some Mailman
   lists.}}
 
 {{Create an Apache virtual host to serve as the web interface for some Mailman
   lists.}}
 

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index 9f30e72..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 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 "")
 
                 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 (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 ";
                             print "    SuexecUserGroup list list\n";
                             print "\n";
                             print "    ErrorLog ";