X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/b6d742526e8fcf69f22589314ee8f12b7756f026..7c43ea06b0694c3a1f50cb1ef17f48271f28b8ce:/config.m4

diff --git a/config.m4 b/config.m4
index d84f648..ada2909 100644
--- a/config.m4
+++ b/config.m4
@@ -24,12 +24,23 @@
 ## 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)
 
 ## The user who runs verification filters.
 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)
 DEFCONF(spamd_port, 783)
@@ -37,6 +48,9 @@ DEFCONF(spamd_port, 783)
 ## Default spam limit for incoming mail (multiplied by ten).
 DEFCONF(spam_max, 50)
 
+## Userv stuff for debugging.
+DEFCONF(userv_opts, )
+
 ## Which interfaces to listen on.  Exim checks for the literal string `::0'
 ## when setting things up: don't use `::', or we'll be tripped up by Linux's
 ## demented non-`IPV6_V6ONLY' behaviour.
@@ -55,12 +69,11 @@ DEFCONF(alias_file, /etc/aliases)
 DEFCONF(ca_dir, /etc/ca)
 
 ## User address suffix handling.
-DEFCONF(user_suffix_list, -* : +*)
-DEFCONF(user_extaddr_regexp, $acl_c_user([-+@]|\$))
+DEFCONF(user_suffix_list, +* : -*)
 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