<weasel> zobel: why are you moving MX to a machine with loads of disk? why not pick...

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f60ab0c45ccbd9070db22fa34f73dcd152205816..32530c95107235e0fdd5745e6f7d09f948600dda 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -114,6 +114,7 @@ services:
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
+    - merikanto.debian.org
   muninmaster: spohr.debian.org
   nagiosmaster:
     - draghi.debian.org
@@ -133,6 +134,7 @@ host_settings:
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
+    - merikanto.debian.org
     - merkel.debian.org
     - morricone.debian.org
     - powell.debian.org
@@ -240,7 +242,6 @@ host_settings:
     mayer.debian.org: mailout.debian.org
     mayr.debian.org: mailout.debian.org
     mendes.debian.org: mailout.debian.org
-    merikanto.debian.org: mailout.debian.org
     merulo.debian.org: mailout.debian.org
     monteverdi.debian.org: mailout.debian.org
     morales.debian.org: mailout.debian.org

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 457d4da241405b7ff998432fbdf16220d459ed77..c798cc9104827a8e295adcf27ea1fd33cb2395d9 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -10,7 +10,7 @@
 <%=
 mxmatches = [ fqdn ]
 case fqdn
-when 'spohr.debian.org', 'draghi.debian.org' then 
+when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
   mxmatches << 'mailout.debian.org'
 end