From: Stephen Gran <steve@lobefin.net>
Date: Tue, 21 Sep 2010 21:05:02 +0000 (+0100)
Subject: kokokokokokkonnenenen as a mail relay
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7af993b35bdb4a219b4f631d1f64ab1811923597;p=mirror%2Fdsa-puppet.git

kokokokokokkonnenenen as a mail relay

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

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