update hcoop changes to 01_exim4_config_listmacrodefs

diff --git a/conf.d/main/01_exim4-config_listmacrosdefs b/conf.d/main/01_exim4-config_listmacrosdefs
index 8e51605..55651db 100644 (file)
--- a/conf.d/main/01_exim4-config_listmacrosdefs
+++ b/conf.d/main/01_exim4-config_listmacrosdefs
@@ -35,11 +35,18 @@ UPEX4CmacrosUPEX4C = 1
 
 # List of domains considered local for exim. Domains not listed here
 # need to be deliverable remotely.
-domainlist local_domains = MAIN_LOCAL_DOMAINS
+# hcoop-change: comment out
+#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.
-domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS
+# hcoop-change: comment out
+#domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS
+
+# hcoop-change: List of domains that accept mail from local users.
+# Mail sent to other domains we manage will be transformed into a
+# local address by /etc/aliases.
+domainlist unix_domains = hcoop.net:deleuze.hcoop.net:hopper.hcoop.net:mire.hcoop.net:outpost.hcoop.net:localhost
 
 # List of sender networks (IP addresses) to _unconditionally_ relay
 # _for_. If you intend to be SMTP AUTH server, you do not need to enter
@@ -95,6 +102,17 @@ 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
+
+# hcoop-change: enable TLS
+MAIN_TLS_ENABLE = yes