mwolson: Make progress on email delivery

[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 0f9f637..0a792ae 100644 (file)
--- a/conf.d/main/01_exim4-config_listmacrosdefs
+++ b/conf.d/main/01_exim4-config_listmacrosdefs
@@ -49,17 +49,19 @@ DC_visiblename=DEBCONFvisiblenameDEBCONF
 
 # 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
+# hcoop-change: comment out
+#.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
+# hcoop-change: comment out
+#.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
@@ -143,6 +145,14 @@ CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./
 .endif
 
 # always log tls_peerdn as we use TLS for outgoing connects by default
+# hcoop-change: add +tls_ciper
 .ifndef MAIN_LOG_SELECTOR
-MAIN_LOG_SELECTOR = +tls_peerdn
+MAIN_LOG_SELECTOR = +tls_cipher +tls_peerdn
 .endif
+
+# hcoop-change: use file_transport = address_file for /etc/aliases
+# delivery, as per old configuration
+SYSTEM_ALIASES_FILE_TRANSPORT = address_file
+
+# hcoop-change: deliver mail to AFS
+MAILDIR_HOME_MAILDIR_LOCATION = /afs/hcoop.net/common/email