X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=d47c2ce1068f1abf781c989a5a12355df5cbd302;hb=215a052cae9e4e1862c9ce67461ae4091d95371d;hp=13fe4b1a0995a7de5b983fccda993ddfd71e50ec;hpb=319e0b54cc1d862499a70dbe9c4b236d2c53b0dc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 13fe4b1a0..d47c2ce10 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
@@ -26,6 +21,41 @@ paganini.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: ries.debian.org
+    target_port: 5433
+
+stabile.debian.org:
+  # snapshot postgresql streaming replication.  sibelius is the master, stabile 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
+
+wagner.debian.org:
+  - source_bind_port: 5441
+    target_host: samosa.debian.org
+    target_port: 5441
+