base.m4: Be extra persistent when trying to deliver mail to the relay.

[exim-config] / lists.m4

diff --git a/lists.m4 b/lists.m4
index 52c42da..88ae8c8 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -25,15 +25,37 @@ 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
+
+## Addresses which are likely to be bogus.  These are zero, loopback,
+## multicast, broadcast (IPv4), and blocks reserved for documentation.
+hostlist bogus = <; \
+        :: ; ::1 ; ff00::/8 ; 2001:db8::/32 ; \
+        0.0.0.0 ; 127.0.0.0/8 ; 224.0.0.0/4 ; 255.255.255.255 ; \
+        192.0.2.0/24 ; 198.51.100.0/24 ; 203.0.113.0/24
+
+## Addresses which are likely to be bogus as public mailservers.  These are
+## the generally bogus addresses, plus link-local and private use addresses.
+hostlist bogus_public = <; \
+       +bogus ; \
+       fe80::/10 ; fc00::/7 ; \
+       169.254.0.0/16 ; 10.0.0.0/8 ; 172.16.0.0/12 ; 192.168.0.0/16
 
 ## Domains we're authoritative for.
 domainlist thishost = @ : @[] : \
@@ -41,18 +63,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
-addresslist 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 --------------------------------------------------