mailman: open /usr/share/images/mailman, revert to mod_access_compat

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

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index a4f5a6c..d165dc6 100644 (file)
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -42,8 +42,6 @@ fun mailmanPlace (EApp ((EVar "mailman_place_default", _), (EString node, _)), _
     SOME (node, ip)
   | mailmanPlace _ = NONE
 
     SOME (node, ip)
   | mailmanPlace _ = NONE
 

-fun mailmanPlaceDefault node = (EApp ((EVar "mailman_place_default", dl), (EString node, dl)), dl)
-

 val _ = Env.registerFunction ("mailman_place_to_web_node",
                              fn [e] => Option.map (fn (node, _) => (EString node, dl)) (mailmanPlace e)
                               | _ => NONE)
 val _ = Env.registerFunction ("mailman_place_to_web_node",
                              fn [e] => Option.map (fn (node, _) => (EString node, dl)) (mailmanPlace e)
                               | _ => NONE)


@@ -56,11 +54,6 @@ val _ = Env.registerFunction ("mailman_place_to_ip",
                              fn [e] => Option.map (fn (_, ip) => (EString ip, dl)) (mailmanPlace e)
                               | _ => NONE)
 
                              fn [e] => Option.map (fn (_, ip) => (EString ip, dl)) (mailmanPlace e)
                               | _ => NONE)
 

-val () = Defaults.registerDefault
-            ("MailmanPlaces",
-             (TList (TBase "mailman_place", dl), dl),
-             (fn () => (EList [mailmanPlaceDefault Config.Mailman.node], dl)))
-

 val files = ref ([] : TextIO.outstream list)
 val write = ref (fn _ : string => ())
 
 val files = ref ([] : TextIO.outstream list)
 val write = ref (fn _ : string => ())
 


@@ -119,8 +112,10 @@ val () = Env.actionV_one "mailmanVhost"
                             print "    ServerAdmin ";
                             print sadmin;
                             print "\n";
                             print "    ServerAdmin ";
                             print sadmin;
                             print "\n";

-                            print "    SuexecUserGroup list list\n";
+                            (* 
+                             print "    SuexecUserGroup list list\n";

                             print "\n";
                             print "\n";

+                            *)

                             print "    ErrorLog ";
                             print ld;
                             print "/error.log\n";
                             print "    ErrorLog ";
                             print ld;
                             print "/error.log\n";


@@ -155,6 +150,18 @@ val () = Env.actionV_one "mailmanVhost"
                             print "        Order allow,deny\n";
                             print "        Allow from all\n";
                             print "    </Directory>\n";
                             print "        Order allow,deny\n";
                             print "        Allow from all\n";
                             print "    </Directory>\n";

+                            print "\n";
+                            print "\n";
+                            print "    <Directory /usr/share/images/mailman>\n";
+                            print "        Order allow,deny\n";
+                            print "        Allow from all\n";
+                            print "    </Directory>\n";
+                            print "\n";
+                            print "    <Directory /var/lib/mailman/archives/public/>\n";
+                            print "        Options +SymlinksIfOwnerMatch -ExecCGI +Indexes\n";
+                            print "        Order allow,deny\n";
+                            print "        Allow from all\n";
+                            print "    </Directory>\n";

 
                             Apache.doPre {user = user, nodes = map #1 places, id = vhostId, hostname = fullHost};
 
 
                             Apache.doPre {user = user, nodes = map #1 places, id = vhostId, hostname = fullHost};