defs.m4: New macros for inserting separators into lists.

[exim-config] / config.m4

diff --git a/config.m4 b/config.m4
index d84f648e18d70c0af771505f37cba509e6fd9a04..ee20d3a7238394de76559f72b5bc241214118890 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -24,12 +24,20 @@
 ## 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)
 
 ## 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 +45,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,7 +66,7 @@ DEFCONF(alias_file, /etc/aliases)
 DEFCONF(ca_dir, /etc/ca)
 
 ## User address suffix handling.
-DEFCONF(user_suffix_list, -* : +*)
+DEFCONF(user_suffix_list, +* : -*)
 DEFCONF(user_extaddr_regexp, $acl_c_user([-+@]|\$))
 DEFCONF(user_extaddr_fixup, ${sg {$local_part_suffix}{^[-+]}{}})