X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=f8d6dbbb3907eaeabb6f6d3292ad4a2c081595b1;hb=bc12cd8473771b6feb8de7d688a783b519311d44;hp=4449f37b9823af77216d025bfc947db80d355642;hpb=e733600e917f78330b957715d1a2cf6d06c18963;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 4449f37b9..f8d6dbbb3 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -5,40 +5,17 @@
 # port on the remote instead of just encoding it in authkeys.
 
 # from host:port to host:port
-master.debian.org:
-  - source_bind_port: 5441
-    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
-    target_port: 5433
-
-paganini.debian.org:
-  - source_bind_port: 5441
-    target_host: samosa.debian.org
-    target_port: 5441
 
 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
-    target_host: samosa.debian.org
-    target_port: 5441
 
 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,3 +23,27 @@ 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
+    target_host: grieg.debian.org
+    target_port: 5433
+
+ries.debian.org:
+  # dak postgresql streaming replication.  franck is the master, ries the slave.
+  - source_bind_port: 15433
+    target_host: franck.debian.org
+    target_port: 5433
+
+blavet.debian.org:
+  # emdebian->projectb mirror
+  - source_bind_port: 5433
+    target_host: ries.debian.org
+    target_port: 5433