lenny hosts do not have /etc/apt/preferences.d/

[dsa-puppet.git] / modules / portforwarder / misc / config.yaml

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 701480238dfdcfbcf356f8c2f19f5cf8176f9fce..3cca00aeff3714381fbc1f887322e56acd6145b5 100644 (file)
--- 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:
@@ -52,6 +42,12 @@ stabile.debian.org:
     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
@@ -64,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