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 b9dcbf1feaace2cdd85c68c90e9a997d7a243874..5fdf2484bd0d24ca8d2b078e9f6c657385c726c7 100644 (file)
--- 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 2b84b4ede1d4545636d64d513014aba7c901d020..ce22a342b867ca9adfa9a4e5021a94d3111889da 100644 (file)
--- 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