From 47163553073524f0828c5d7cf066c94f650197f5 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Mon, 19 Feb 2007 02:37:00 +0000 Subject: [PATCH] Generating Exim config file with domainlist --- configDefault/mailman.cfg | 1 + configDefault/mailman.csg | 1 + scripts/domtool-publish | 4 +++- src/env.sml | 4 +++- src/plugins/apache.sml | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configDefault/mailman.cfg b/configDefault/mailman.cfg index 5be37df..090de39 100644 --- a/configDefault/mailman.cfg +++ b/configDefault/mailman.cfg @@ -3,6 +3,7 @@ structure Mailman :> MAILMAN_CONFIG = struct val node = "deleuze" val mapFile = "/var/domtool/mailman.map" +val handleDomains = "/var/domtool/mailman_domains.cfg" val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish mailman" diff --git a/configDefault/mailman.csg b/configDefault/mailman.csg index 19eadb4..06efd65 100644 --- a/configDefault/mailman.csg +++ b/configDefault/mailman.csg @@ -3,6 +3,7 @@ signature MAILMAN_CONFIG = sig val node : string val mapFile : string + val handleDomains : string val reload : string diff --git a/scripts/domtool-publish b/scripts/domtool-publish index fdc9da8..6412a91 100755 --- a/scripts/domtool-publish +++ b/scripts/domtool-publish @@ -20,7 +20,9 @@ case $1 in exim) /bin/cp /var/domtool/aliases /etc/ /bin/cp /var/domtool/aliases.default /etc/ - /bin/cp /var/domtool/local_domains.cfg /etc/exim4/ + /bin/echo -n "domainlist local_domains = " >/etc/exim4/conf.d/main/10_domtool-domains + /bin/cat /var/domtool/local_domains.cfg >>/etc/exim4/conf.d/main/10_domtool-domains + /bin/echo "" >>/etc/exim4/conf.d/main/10_domtool-domains /etc/init.d/exim4 reload ;; mailman) diff --git a/src/env.sml b/src/env.sml index f87278f..edb1ffd 100644 --- a/src/env.sml +++ b/src/env.sml @@ -170,7 +170,9 @@ fun env arg (evs, name) = NONE => raise Fail ("Unavailable environment variable " ^ name) | SOME e => case arg e of - NONE => raise Fail ("Bad format for environment variable " ^ name) + NONE => (Print.preface ("Unexpected value for " ^ name ^ ":", + Print.p_exp e); + raise Fail ("Bad format for environment variable " ^ name)) | SOME v => v fun type_one func arg f = diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml index f7d13c2..541b144 100644 --- a/src/plugins/apache.sml +++ b/src/plugins/apache.sml @@ -95,7 +95,7 @@ val _ = Defaults.registerDefault ("WebNodes", val _ = Defaults.registerDefault ("SSL", (TBase "ssl", dl), - (fn () => (EVar "false", dl))) + (fn () => (EVar "no_ssl", dl))) val _ = Defaults.registerDefault ("User", (TBase "your_user", dl), -- 2.20.1