X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=cf6c9e6f30c2f444050495d35813673556f0dba3;hb=55a3c128c301b245a78905f794de915dab2f89eb;hp=05503f58382836e1f658e034d1ba309d93682c20;hpb=5a5195cf8eff8bc3f6c0f81bd75fa90ddae30d81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 05503f583..cf6c9e6f3 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -5,49 +5,39 @@
 # 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:
-  # snapshot postgresql streaming replication.  sibelius is the master, stabile the slave.
+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