X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fexim4%2Fconf.d%2Fmain%2Fmain_config;h=2f04f43338c28855c60b35f47599615610d7ce09;hb=refs%2Fheads%2Fmail;hp=bc4e7b1ae3a5537e4a87ce2c9268630c1fa9a06c;hpb=b17c59cdaba252243080d79ec3e800a840e3e2f2;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/exim4/conf.d/main/main_config b/etc/exim4/conf.d/main/main_config
index bc4e7b1..2f04f43 100644
--- a/etc/exim4/conf.d/main/main_config
+++ b/etc/exim4/conf.d/main/main_config
@@ -8,7 +8,7 @@ LDAPBASE=dc=drsnuggles,dc=stderr,dc=nl
 
 # List of virtual domains for which we deliver to any address that happens to
 # be configured in the LDAP directory.
-domainlist virtual_domains = stdin.nl : stderr.nl : stdout.nl : blues-brothers.eu : foresightsecurity.nl
+domainlist virtual_domains = stdin.nl : stderr.nl : stdout.nl : blues-brothers.eu : foresightsecurity.nl : hekjelarp.nl : mkit.nl : chimara-if.org
 # List of real hosts for which we deliver mail to real users.
 domainlist real_domains = *.drsnuggles.stderr.nl : drsnuggles.stderr.nl
 # The list of domains for which we handle mail ourselves
@@ -23,12 +23,18 @@ domainlist relay_to_domains = fizzgig.eu : fizzgig.nl
 # at first glance.
 hostlist relay_from_hosts = *.drsnuggles.stderr.nl : drsnuggles.stderr.nl 
 
+# Don't reject spam from these hosts, since they are known dumb, but trusted
+# relays. They will only send rejects to the wrong people.
+hostlist dont_reject_spam_hosts = *.utsp.utwente.nl : mx*.snt.utwente.nl
+
 # Use this domain on any unqualified addresses that get submitted. Since this
 # can come from any vserver, just use our main hostname.
 qualify_domain = drsnuggles.stderr.nl
 
-# Let exim know how the rest of the world will try to reach us.
-hosts_treat_as_local = drsnuggles.stderr.nl
+# Let exim know how the rest of the world will try to reach us. The
+# stmp transport also uses this macro for its helo command.
+EXTERNAL_HOSTNAME = drsnuggles.stderr.nl
+hosts_treat_as_local = EXTERNAL_HOSTNAME
 
 # The gecos field in /etc/passwd holds not only the name. see passwd(5).
 gecos_pattern = ^([^,:]*)
@@ -59,8 +65,11 @@ timeout_frozen_after = 7d
 freeze_tell = postmaster
 # Define spool directory
 spool_directory = /var/spool/exim4
+# Don't send out delivery delay warnings (by default once every 24h).
+delay_warning =
 
 # Log subjects, for easy tracing of messages and peer dn on TLS connections.
-log_selector = +subject +tls_peerdn +tls_certificate_verified
+# Don't log complete headers on rejects, that clutters the log.
+log_selector = +subject +tls_peerdn +tls_certificate_verified -rejected_header
 
 # vim: set sts=2 expandtab sw=2 ai: