spam.m4: Rename X-SpamAssassin-* headers to X-Distorted-SpamAssassin-*.

[exim-config] / config.m4

diff --git a/config.m4 b/config.m4
index c4931fe..e440d28 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -24,6 +24,10 @@
 ## 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 domanis.
+DEFCONF(sysdomains, CONF_master_domain)
+
 ## The smarthost for satellite hosts.
 DEFCONF(smarthost, mail.distorted.org.uk)
 
@@ -32,6 +36,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,7 +67,6 @@ 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.