From 660c77171f842dc3f19b7fe95c5a4e62a38117d2 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 13 Dec 2012 13:25:22 +0200
Subject: [PATCH] fxied bug with unrouteable aliases

---
 install/0.9.7/rhel/exim.conf | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/install/0.9.7/rhel/exim.conf b/install/0.9.7/rhel/exim.conf
index 42b9335f3..42ae2d682 100644
--- a/install/0.9.7/rhel/exim.conf
+++ b/install/0.9.7/rhel/exim.conf
@@ -27,7 +27,7 @@ tls_advertise_hosts = *
 tls_certificate = /etc/pki/tls/certs/exim.pem
 tls_privatekey = /etc/pki/tls/private/exim.pem
 
-daemon_smtp_ports = 25 : 465 : 587
+daemon_smtp_ports = 25 : 465 : 587 : 2525
 tls_on_connect_ports = 465
 never_users = root
 host_lookup = *
@@ -40,6 +40,7 @@ DKIM_DOMAIN = ${lc:${domain:$h_from:}}
 DKIM_FILE = /etc/exim/domains/${lc:${domain:$h_from:}}/dkim.pem
 DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}}
 
+
 ##########################################################################
 begin acl
 ##########################################################################
@@ -162,12 +163,13 @@ begin routers
 ##########################################################################
 dnslookup:
   driver = dnslookup
-  domains = ! +local_domains
+  domains = !+local_domains
   transport = remote_smtp
 #  ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
 #system_aliases:
+#  domains = +local_domains
 #  driver = redirect
 #  allow_fail
 #  allow_defer
@@ -211,6 +213,7 @@ aliases:
   pipe_transport = address_pipe
   unseen
 
+
 localuser_spam:
   driver = accept
   transport = local_spam_delivery
@@ -229,18 +232,25 @@ catchall:
   file_transport = local_delivery
   redirect_router = dnslookup
 
+terminate_alias:
+  driver = accept
+  transport = devnull
+  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/$domain/aliases}{true}{false}}
+
 
 ##########################################################################
 begin transports
 ##########################################################################
 remote_smtp:
   driver = smtp
+  helo_data = $sender_address_domain
   dkim_domain = DKIM_DOMAIN
   dkim_selector = mail
   dkim_private_key = DKIM_PRIVATE_KEY
   dkim_canon = relaxed
   dkim_strict = 0
 
+
 procmail:
   driver = pipe
   command = "/usr/bin/procmail -d $local_part"
@@ -306,6 +316,10 @@ userautoreply:
   subject = "${if def:h_Subject: {Autoreply: ${quote:${escape:$h_Subject:}}} {Autoreply Message}}"
   to = "${sender_address}"
 
+devnull:
+  driver = appendfile
+  file = /dev/null
+
 ##########################################################################
 begin retry
 *                      *           F,2h,15m; G,16h,1h,1.5; F,4d,6h