X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/185b5456076ca86959643ce2f19c98c0f82f281e..2f2fc64da4fd3e3edb06589a5e7dd0f3e958a40b:/lists.m4

diff --git a/lists.m4 b/lists.m4
index 85d48c2..8f12fd8 100644
--- a/lists.m4
+++ b/lists.m4
@@ -25,15 +25,23 @@ SECTION(global, lists)m4_dnl
 ## Definitions for known networks.
 hostlist localnet = <; \
 	127.0.0.0/8 ; ::1
+hostlist thishost = <; \
+	 +localnet ; @[]
+hostlist foreign = <; \
+	212.13.198.76 ; 2001:ba8:0:1d9::1:1
 hostlist border = <; \
+	! +foreign ; \
 	62.49.204.144/28 ; 2001:470:1f09:1b98::/64 ; \
+	81.2.113.195 ; 81.187.238.128/28 ; \
 	212.13.198.64/28 ; 2001:ba8:0:1d9::/64
 hostlist trusted = <; \
 	+localnet ; +border ; \
-	172.29.199.0/24 ; 2001:ba8:1d9::/49 ; 2001:470:9740::/49
+	172.29.199.0/24 ; 2001:8b0:c92::/49 ; \
+	2001:ba8:1d9::/49 ; 2001:470:9740::/49
 hostlist allnets = <; \
 	+localnet ; +border ; \
-	172.29.198.0/23 ; 2001:ba8:1d9::/48 ; 2001:470:9740::/48
+	172.29.198.0/23 ; 2001:8b0:c92::/48 ; \
+	2001:ba8:1d9::/48 ; 2001:470:9740::/48
 
 ## Domains we're authoritative for.
 domainlist thishost = @ : @[] : \
@@ -41,17 +49,10 @@ domainlist thishost = @ : @[] : \
 			 { telecaster=tele \
 			   stratocaster=strat }}} \
 	      {$item.$qualify_domain}}
-domainlist public = +thishost : distorted.org.uk
-domainlist known = +public : \
-	${if exists{CONF_sysconf_dir/domains.conf} \
-	     {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
-	     {}}
+domainlist public = +thishost : CONF_sysdomains
 
-## Some magic lists used because `match_local_parts' and friends don't expand
-## their right-hand sides.
-localpartlist dom_users = ${expand:KV(users, {$value}{*})}
-localpartlist dom_locals = ${expand:KV(locals, {$value}{+user_extaddr})}
-localpartlist user_extaddr = ^CONF_user_extaddr_regexp
+## All of the `standard' local parts which ought to be provided by a domain.
+localpartlist required = postmaster : abuse
 
 DIVERT(null)
 ###----- That's all, folks --------------------------------------------------