X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/3ae703b6dff72066727eb5087151c4be8d439ed3..984a831b49726c8ac1b517631b4bb4d071d1bb6a:/src/plugins/mailman.sml

diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index a4f5a6c..d165dc6 100644
--- 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
 
-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)
@@ -56,11 +54,6 @@ val _ = Env.registerFunction ("mailman_place_to_ip",
 			      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 => ())
 
@@ -119,8 +112,10 @@ val () = Env.actionV_one "mailmanVhost"
 			     print "    ServerAdmin ";
 			     print sadmin;
 			     print "\n";
-			     print "    SuexecUserGroup list list\n";
+			     (* 
+                             print "    SuexecUserGroup list list\n";
 			     print "\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 "\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};