From f79882c1f21927fcbbf8dea49db6a7ffaa8e53e8 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Sun, 18 Apr 2010 15:06:51 +0100
Subject: [PATCH] where did my mail go?

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 modules/exim/templates/eximconf.erb       | 4 ++--
 modules/exim/templates/locals.erb         | 4 ----
 modules/exim/templates/virtualdomains.erb | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 3bd6f9063..d640d94ee 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1211,9 +1211,9 @@ ldap_aliases:
   driver = redirect
   allow_defer
   allow_fail
-  data = ${if exists{/var/lib/misc/$primary_hostname/mail-forward.cdb}\
+  data = ${if exists{/var/lib/misc/$primary_hostname/user-forward.cdb}\
              {${lookup{$local_part}cdb\
-	       {/var/lib/misc/$primary_hostname/mail-forward.cdb}}}}
+	       {/var/lib/misc/$primary_hostname/user-forward.cdb}}}}
   domains = +local_domains
   file_transport = address_file
   headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
diff --git a/modules/exim/templates/locals.erb b/modules/exim/templates/locals.erb
index 6d81aabb8..52564a643 100644
--- a/modules/exim/templates/locals.erb
+++ b/modules/exim/templates/locals.erb
@@ -8,10 +8,6 @@ locals = case fqdn
         when "albeniz.debian.org" then "deb-alpha1.sanger.ac.uk"
         when "ball.debian.org" then "ball.einval.com"
         when "malo.debian.org" then "malo.debian.osuosl.org"
-        when "master.debian.org" then "master.debian.org
-debian.org
-debian.novare.net
-master.novare.net"
         when "rem.debian.org" then "rem.rfc822.org"
         when "saens.debian.org" then "debian-mirror.cs.umn.edu"
 end
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 165ee5b99..8de764a3f 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -40,6 +40,7 @@ www-master.debian.org: user=debwww group=debwww directory=/org/www.debian.org/ma
         when "master.debian.org" then "vote.debian.org: user=secretary group=debvote directory=/org/vote.debian.org/mail
 packages.qa.debian.org: user=qa group=qa directory=/org/packages.qa.debian.org/mail
 bugs.qa.debian.org: user=cjwatson group=qa directory=/org/bugs.qa.debian.org/mail
+debian.org: user=debian group=Debian directory=/org/debian.org/mail
 debian.com: user=nobody group=Debian directory=/org/star.debian.star/
 debian.net: user=nobody group=Debian directory=/org/star.debian.star/"
 
-- 
2.20.1