X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=3cca00aeff3714381fbc1f887322e56acd6145b5;hb=c429f34b4841fc1c41eac251fc2e9203704b1164;hp=75bc81bc5d0b693ef67ee45aec66f259fcde05da;hpb=0d8ad1cdd4ef11110cb740e7ab85d676633dd51d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 75bc81bc5..3cca00aef 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -10,11 +10,6 @@ master.debian.org:
     target_host: samosa.debian.org
     target_port: 5441
 
-merkel.debian.org:
-  - source_bind_port: 5441
-    target_host: samosa.debian.org
-    target_port: 5441
-
 samosa.debian.org:
   - source_bind_port: 5433
     target_host: grieg.debian.org
@@ -28,7 +23,7 @@ paganini.debian.org:
 quantz.debian.org:
   # qa->projectb mirror
   - source_bind_port: 5433
-    target_host: merkel.debian.org
+    target_host: ries.debian.org
     target_port: 5433
   # qa->udd
   - source_bind_port: 5441
@@ -38,7 +33,7 @@ quantz.debian.org:
 nono.debian.org:
   # nm->projectb mirror
   - source_bind_port: 5433
-    target_host: merkel.debian.org
+    target_host: ries.debian.org
     target_port: 5433
 
 stabile.debian.org:
@@ -46,6 +41,13 @@ stabile.debian.org:
   - source_bind_port: 15433
     target_host: sibelius.debian.org
     target_port: 5433
+    ssh_options: -oAddressFamily=inet
+danzi.debian.org:
+  # snapshot postgresql streaming replication.  sibelius is the master, danzi the slave.
+  - source_bind_port: 15433
+    target_host: sibelius.debian.org
+    target_port: 5433
+    ssh_options: -oAddressFamily=inet
 
 franck.debian.org:
   - source_bind_port: 5443
@@ -58,3 +60,13 @@ ries.debian.org:
     target_host: franck.debian.org
     target_port: 5433
 
+wagner.debian.org:
+  - source_bind_port: 5441
+    target_host: samosa.debian.org
+    target_port: 5441
+
+blavet.debian.org:
+  # emdebian->projectb mirror
+  - source_bind_port: 5433
+    target_host: ries.debian.org
+    target_port: 5433