mwolson: Upgrade exim4 packages to equivalent of version in debian testing

[hcoop/zz_old/config/exim4-hopper.git] / conf.d / main / 01_exim4-config_listmacrosdefs

diff --git a/conf.d/main/01_exim4-config_listmacrosdefs b/conf.d/main/01_exim4-config_listmacrosdefs
index 673792b..0f9f637 100644 (file)
--- a/conf.d/main/01_exim4-config_listmacrosdefs
+++ b/conf.d/main/01_exim4-config_listmacrosdefs
@@ -4,10 +4,13 @@
 ######################################################################
 
 ######################################################################
-# Depending on where you find this file, this might be a template or
-# an actual configuration file. Documentation about the Debian exim4
-# configuration scheme can be found in
-# /usr/share/doc/exim4-base/README.Debian.gz.
+# /etc/exim4/exim4.conf.template is only used with the non-split
+#   configuration scheme.
+# /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs is only used
+#   with the split configuration scheme.
+# If you find this comment anywhere else, somebody copied it there.
+# Documentation about the Debian exim4 configuration scheme can be
+# found in /usr/share/doc/exim4-base/README.Debian.gz.
 #
 # Strings like DEBCONFsomethingDEBCONF are replaced by installation
 # dependent values by update-exim4.conf, the script which builds the
@@ -44,20 +47,27 @@ DC_visiblename=DEBCONFvisiblenameDEBCONF
 # Create domain and host lists for relay control
 # '@' refers to 'the name of the local host'
 
+# List of domains considered local for exim. Domains not listed here
+# need to be deliverable remotely.
 .ifndef MAIN_LOCAL_DOMAINS
 MAIN_LOCAL_DOMAINS = DEBCONFlocal_domainsDEBCONF
 .endif
 domainlist local_domains = MAIN_LOCAL_DOMAINS
 
+# List of recipient domains to relay _to_. Use this list if you're -
+# for example - fallback MX or mail gateway for domains.
 .ifndef MAIN_RELAY_TO_DOMAINS
 MAIN_RELAY_TO_DOMAINS = DEBCONFrelay_domainsDEBCONF
 .endif
 domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS
 
+# List of sender networks (IP addresses) to _unconditionally_ relay
+# _for_. If you intend to be SMTP AUTH server, you do not need to enter
+# anything here.
 .ifndef MAIN_RELAY_NETS
 MAIN_RELAY_NETS = DEBCONFrelay_netsDEBCONF
 .endif
-hostlist relay_from_hosts = 127.0.0.1 : ::::1 : MAIN_RELAY_NETS
+hostlist relay_from_hosts = MAIN_RELAY_NETS
 
 
 # Specify the domain you want to be added to all unqualified addresses
@@ -114,23 +124,25 @@ DCconfig_DEBCONFconfigtypeDEBCONF = 1
 
 
 # define macros to be used in acl/30_exim4-config_check_rcpt to check
-# recipient local parts for strange characters
+# recipient local parts for strange characters.
+
+# This macro definition really should be in
+# acl/30_exim4-config_check_rcpt but cannot be there due to
+# http://www.exim.org/bugzilla/show_bug.cgi?id=101 as of exim 4.62.
+
+# These macros are documented in acl/30_exim4-config_check_rcpt,
+# can be changed here or overridden by a locally added configuration
+# file as described in README.Debian chapter 2.1.2
 
-# This macro is used to check local parts of recipients in local
-# domains.  It blocks local parts that begin with a dot or contain a
-# quite broad range of non-alphanumeric characters.
 .ifndef CHECK_RCPT_LOCAL_LOCALPARTS
-CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|\'`#&?]
+CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?]
 .endif
 
-# This macro is used to check local parts of recipients in non-local
-# domains. It thus allows your own users to send outgoing messages to
-# sites that use slashes and vertical bars in their local parts. It blocks
-# local parts that begin with a dot, slash, or vertical bar, but allows
-# these characters within the local part. However, the sequence /../ is
-# barred. The use of some other non-alphanumeric characters is blocked.
-# The motivation here is to prevent your users (or your users' viruses)
-# from mounting certain kinds of attack on remote sites.
 .ifndef CHECK_RCPT_REMOTE_LOCALPARTS
-CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!\'`#&?] : ^.*/\\.\\./
+CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./
+.endif
+
+# always log tls_peerdn as we use TLS for outgoing connects by default
+.ifndef MAIN_LOG_SELECTOR
+MAIN_LOG_SELECTOR = +tls_peerdn
 .endif