From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 1 Apr 2015 18:16:07 +0000 (+0100)
Subject: config.m4, exchange.m4, lists.m4: Allow optout from serving main domain.
X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/commitdiff_plain/e913c9991d2a69fb2f1ac5bafa2d9942eb2be60f

config.m4, exchange.m4, lists.m4: Allow optout from serving main domain.

This is useful for hosts which provide external mail service for
special subdomains, but don't provide service for local users.
---

diff --git a/config.m4 b/config.m4
index d64ba68..ee20d3a 100644
--- a/config.m4
+++ b/config.m4
@@ -24,6 +24,10 @@
 ## Master domain name.
 DEFCONF(master_domain, distorted.org.uk)
 
+## List of home-system mail domain names.  This can be empty if we only
+## provide service for special-purpose domanis.
+DEFCONF(sysdomains, CONF_master_domain)
+
 ## The smarthost for satellite hosts.
 DEFCONF(smarthost, mail.distorted.org.uk)
 
diff --git a/exchange.m4 b/exchange.m4
index b0dab45..1e82249 100644
--- a/exchange.m4
+++ b/exchange.m4
@@ -70,7 +70,7 @@ SECTION(routers, remote)m4_dnl
 ## Send mail on to a host in our own network.  We must apply extra security.
 local:
 	driver = dnslookup
-	domains = ! +known : *.CONF_master_domain
+	domains = ! +known : CONF_master_domain : *.CONF_master_domain
 	self = fail
 	transport = smtp_local
 	no_more
diff --git a/lists.m4 b/lists.m4
index 39f2ee4..58cb948 100644
--- a/lists.m4
+++ b/lists.m4
@@ -43,7 +43,7 @@ domainlist thishost = @ : @[] : \
 			 { telecaster=tele \
 			   stratocaster=strat }}} \
 	      {$item.$qualify_domain}}
-domainlist public = +thishost : distorted.org.uk
+domainlist public = +thishost : CONF_sysdomains
 domainlist known = +public : \
 	${if exists{CONF_sysconf_dir/domains.conf} \
 	     {partial0-lsearch; CONF_sysconf_dir/domains.conf} \