X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/e913c9991d2a69fb2f1ac5bafa2d9942eb2be60f..c4a3e72446b05c87bbeb6f42f6c623ceb9c857c7:/lists.m4 diff --git a/lists.m4 b/lists.m4 index 58cb948..7f33c31 100644 --- a/lists.m4 +++ b/lists.m4 @@ -27,7 +27,10 @@ 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 ; \ 212.13.198.64/28 ; 2001:ba8:0:1d9::/64 hostlist trusted = <; \ @@ -44,18 +47,6 @@ domainlist thishost = @ : @[] : \ stratocaster=strat }}} \ {$item.$qualify_domain}} domainlist public = +thishost : CONF_sysdomains -domainlist known = +public : \ - ${if exists{CONF_sysconf_dir/domains.conf} \ - {partial0-lsearch; CONF_sysconf_dir/domains.conf} \ - {}} - -## 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 -addresslist value = $value ## All of the `standard' local parts which ought to be provided by a domain. localpartlist required = postmaster : abuse