HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge toplevel-dynamic-environment
[hcoop/domtool2.git]
/
src
/
plugins
/
mailman.sml
diff --git
a/src/plugins/mailman.sml
b/src/plugins/mailman.sml
index
b716cbd
..
ef0a82f
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 => ())
@@
-69,7
+62,7
@@
val () = Env.action_one "mailmanWebHost"
(fn host =>
let
val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node,
(fn host =>
let
val {write, writeDom, close} = Domain.domainsFile {node = Config.Mailman.node,
- name = "mailman"}
+ name = "mailman
.conf
"}
in
write "\t'";
write host;
in
write "\t'";
write host;
@@
-87,6
+80,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
+110,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 ";
@@
-130,7
+124,11
@@
val () = Env.actionV_one "mailmanVhost"
print " RewriteEngine on\n";
print "\n";
print " # Default to showing listinfo page\n";
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";
print fullHost;
print "/listinfo/\n";
print "\n";
@@
-170,15
+168,15
@@
val () = Slave.registerFileHandler (fn fs =>
val spl = OS.Path.splitDirFile (#file fs)
in
case #file spl of
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
| _ => ()
end)
val () = Slave.registerPostHandler (fn () =>
if !mailmanChanged then
- (Slave.concatTo (fn s => s = "mailman")
+ (Slave.concatTo (fn s => s = "mailman
.conf
")
Config.Mailman.mapFile;
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))
Config.Mailman.handleDomains;
Slave.shellF ([Config.Mailman.reload],
fn cl => "Error reloading Mailman with " ^ cl))
@@
-186,8
+184,8
@@
val () = Slave.registerPostHandler (fn () =>
())
val () = Domain.registerDescriber (Domain.considerAll
())
val () = Domain.registerDescriber (Domain.considerAll
- [Domain.Filename {filename = "mailman",
- heading = "Mailman web host mapping",
+ [Domain.Filename {filename = "mailman
.conf
",
+ heading = "Mailman web host mapping
:
",
showEmpty = false}])
end
showEmpty = false}])
end