From bf716a4daf9652bc9d1b77deac83a2b384fd78bc Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 12:04:57 +0200
Subject: [PATCH 1/1] Register manualroutes from the service class for the
 three services that had it hardcoded in the exim class; and make a
 roles::salsa

---
 data/nodes/godard.debian.org.yaml     | 2 +-
 modules/roles/manifests/salsa.pp      | 6 ++++++
 modules/roles/manifests/tracker.pp    | 3 +++
 modules/roles/manifests/www_master.pp | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 modules/roles/manifests/salsa.pp

diff --git a/data/nodes/godard.debian.org.yaml b/data/nodes/godard.debian.org.yaml
index bc631fe87..a14fd6292 100644
--- a/data/nodes/godard.debian.org.yaml
+++ b/data/nodes/godard.debian.org.yaml
@@ -1,5 +1,5 @@
 classes:
-  - salsa
+  - roles::salsa
 
 ssl::insecure_ssl: true
 roles::mta::type: 'postfix'
diff --git a/modules/roles/manifests/salsa.pp b/modules/roles/manifests/salsa.pp
new file mode 100644
index 000000000..f0cd2942c
--- /dev/null
+++ b/modules/roles/manifests/salsa.pp
@@ -0,0 +1,6 @@
+class roles::salsa {
+  include salsa
+
+  # tell the mail-relays to forward this domain to us
+  exim::manualroute{ 'salsa.debian.org': }
+}
diff --git a/modules/roles/manifests/tracker.pp b/modules/roles/manifests/tracker.pp
index b06be4417..e2ed25056 100644
--- a/modules/roles/manifests/tracker.pp
+++ b/modules/roles/manifests/tracker.pp
@@ -10,6 +10,9 @@ class roles::tracker {
   }
   onion::service { 'tracker.debian.org': port => 80, target_address => 'tracker.debian.org', target_port => 80, direct => true }
 
+  # tell the mail-relays to forward this domain to us
+  exim::manualroute{ 'tracker.debian.org': }
+  # and then handle it locally
   exim::vdomain { 'tracker.debian.org':
     owner => 'qa',
     group => 'qa',
diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 2b3419a58..d8019a891 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -21,6 +21,9 @@ class roles::www_master {
     key    => true,
   }
 
+  # tell the mail-relays to forward this domain to us
+  exim::manualroute{ 'www-master.debian.org': }
+  # and then handle it locally
   exim::vdomain { 'www-master.debian.org':
     owner   => 'debwww',
     group   => 'debwww',
-- 
2.20.1