X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/ea823544809f8f88f3f49d70304d366cea08b366..55595c08d19c504ca7b5381ccdeea319aed87ff3:/config.m4

diff --git a/config.m4 b/config.m4
index c4931fe..ada2909 100644
--- a/config.m4
+++ b/config.m4
@@ -24,6 +24,13 @@
 ## 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 domains.
+DEFCONF(sysdomains, CONF_master_domain)
+
+## The magic token for local header names.
+DEFCONF(header_token, Distorted)
+
 ## The smarthost for satellite hosts.
 DEFCONF(smarthost, mail.distorted.org.uk)
 
@@ -32,6 +39,7 @@ DEFCONF(filter_user, Debian-exim)
 
 ## Administrative groups.
 DEFCONF(admin_groups, root : adm)
+DEFCONF(trusted_groups, root : adm)
 
 ## Where the spam filter is.
 DEFCONF(spamd_address, 172.29.199.179)
@@ -62,11 +70,10 @@ DEFCONF(ca_dir, /etc/ca)
 
 ## User address suffix handling.
 DEFCONF(user_suffix_list, +* : -*)
-DEFCONF(user_extaddr_regexp, $acl_c_user([-+@]|\$))
 DEFCONF(user_extaddr_fixup, ${sg {$local_part_suffix}{^[-+]}{}})
 
 ## Other hosts allowed to relay mail through us.
-DEFCONF(relay_clients, +trusted)
+DEFCONF(relay_clients, <; +trusted ; 172.29.80.8)
 
 ## TLS-related settings.  We're assuming GNUTLS here, rather than OpenSSL.
 ## For local connections we are very strict.  For random clients, we try