apache: reverse host/rewrite arguments in proxyRewrite

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

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index bab7222..6a3b0e1 100644 (file)
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -83,6 +83,7 @@ val () = Env.actionV_one "mailmanVhost"
                 val places = Env.env (Env.list mailmanPlace) (env, "MailmanPlaces")
 
                 val ssl = Env.env Apache.ssl (env, "SSL")
+                val forcessl = Env.env Env.bool (env, "MailmanForceSSL")
                 val user = Env.env Env.string (env, "User")
                 val sadmin = Env.env Env.string (env, "ServerAdmin")
 
@@ -131,7 +132,10 @@ val () = Env.actionV_one "mailmanVhost"
                                 (print "\n\tSSLEngine on\n\tSSLCertificateFile ";
                                  print cert;
                                  print "\n")
-                              | NONE => ();
+                              | NONE => if forcessl then
+                                            (print "\tRewriteRule ^(.*)$ https://%{HTTP_HOST}$1 [R,L]\n")
+                                        else
+                                            ();
                             (*
                              print "    SuexecUserGroup list list\n";
                             print "\n";