Register manualroutes from the service class for the three services that had it hardc...

diff --git a/data/nodes/godard.debian.org.yaml b/data/nodes/godard.debian.org.yaml
index bc631fe..a14fd62 100644 (file)
--- 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 (file)
index 0000000..f0cd294
--- /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 b06be44..e2ed250 100644 (file)
--- 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 2b3419a..d8019a8 100644 (file)
--- 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',