From 2ca083e7949b5c17c4188dd30ca77634620a7591 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sun, 28 Mar 2010 18:57:04 +0200 Subject: [PATCH] zobel: why are you moving MX to a machine with loads of disk? why not pick the dl360? --- modules/debian-org/misc/local.yaml | 3 ++- modules/exim/templates/manualroute.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index f60ab0c4..32530c95 100644 --- 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 457d4da2..c798cc91 100644 --- 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 -- 2.39.2