From 7af993b35bdb4a219b4f631d1f64ab1811923597 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Tue, 21 Sep 2010 22:05:02 +0100 Subject: [PATCH] kokokokokokkonnenenen as a mail relay Signed-off-by: Stephen Gran --- modules/debian-org/misc/local.yaml | 1 + modules/exim/templates/manualroute.erb | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index b9dcbf1fe..5fdf2484b 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -125,6 +125,7 @@ services: - draghi.debian.org mailrelay: - draghi.debian.org + - kokkonen.debian.org - spohr.debian.org - merikanto.debian.org muninmaster: spohr.debian.org diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb index 2b84b4ede..ce22a342b 100644 --- a/modules/exim/templates/manualroute.erb +++ b/modules/exim/templates/manualroute.erb @@ -12,8 +12,7 @@ mxmatches = [ fqdn ] routes = [] extraroutes = [] -case fqdn -when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then +if nodeinfo['mailrelay'] mxmatches << 'mailout.debian.org' extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ] end -- 2.20.1