From: Stephen Gran Date: Sun, 21 Feb 2010 16:47:47 +0000 (+0000) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=36da6c0d8a07c2bc140977902173170800236c67;hp=a47c22e58d6502bb314e9fca3814fae1cadc62e5;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet --- diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index 4e99cd40e..db9273c93 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -10,4 +10,8 @@ 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