X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=b03fb267f37da3a5047f5b153bb6c14168cfe397;hb=eee4d993e0d4ad03aaaa2b8de1ad450660ee139c;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..b03fb267f 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -5,15 +5,10 @@
 # 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
+#master.debian.org:
+#  - source_bind_port: 5441
+#    target_host: samosa.debian.org
+#    target_port: 5441
 
 samosa.debian.org:
   - source_bind_port: 5433
@@ -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