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

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 13c331029..f8d6dbbb3 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -5,45 +5,17 @@
 # port on the remote instead of just encoding it in authkeys.
 
 # from host:port to host:port
-alioth.debian.org:
-  - source_bind_port: 5441
-    target_host: samosa.debian.org
-    target_port: 5441
-
-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: 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:
@@ -51,6 +23,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
@@ -63,3 +42,8 @@ ries.debian.org:
     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