X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmisc%2Fconfig.yaml;h=d47c2ce1068f1abf781c989a5a12355df5cbd302;hb=215a052cae9e4e1862c9ce67461ae4091d95371d;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..d47c2ce10 100644
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -5,21 +5,11 @@
 # 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
@@ -43,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:
@@ -51,6 +41,7 @@ stabile.debian.org:
   - 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 +54,8 @@ 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
+