Don't reject spam messages from a few trusted hosts.

[matthijs/servers/drsnuggles.git] / etc / exim4 / conf.d / main / main_config

diff --git a/etc/exim4/conf.d/main/main_config b/etc/exim4/conf.d/main/main_config
index bc4e7b1ae3a5537e4a87ce2c9268630c1fa9a06c..771d2b6d5d775f157394adef970e74bc994fdd5f 100644 (file)
--- 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
 # 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,6 +23,10 @@ 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 = katherina.student.utwente.nl : kat.student.utwente.nl : *.utsp.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
@@ -59,8 +63,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: