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)
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 => ())
(fn host =>
let
val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node,
- name = "mailman"}
+ name = "mailman.conf"}
in
write "\t'";
write host;
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 "")
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 " 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";
val spl = OS.Path.splitDirFile (#file fs)
in
case #file spl of
- "mailman" => mailmanChanged := true
+ "mailman.conf" => mailmanChanged := true
| _ => ()
end)
val () = Slave.registerPostHandler (fn () =>
if !mailmanChanged then
- (Slave.concatTo (fn s => s = "mailman")
+ (Slave.concatTo (fn s => s = "mailman.conf")
Config.Mailman.mapFile;
- Slave.enumerateTo (fn s => s = "mailman") ":"
+ Slave.enumerateTo (fn s => s = "mailman.conf") ":"
Config.Mailman.handleDomains;
Slave.shellF ([Config.Mailman.reload],
fn cl => "Error reloading Mailman with " ^ cl))
())
val () = Domain.registerDescriber (Domain.considerAll
- [Domain.Filename {filename = "mailman",
+ [Domain.Filename {filename = "mailman.conf",
heading = "Mailman web host mapping:",
showEmpty = false}])