From: Martin Zobel-Helas Date: Sun, 17 Feb 2013 20:19:09 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c2d7c2c6141a812e63429f94827d8c99b3e1deac;hp=177d067c58cc845ec47c567b333b58b2e0bee493;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: udd port from master disable master->samosa forward s/org/srv/ --- diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index 21f845ead..0504b8830 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -40,10 +40,10 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian. when "kaufmann.debian.org" then "keyring.debian.org: user=keyring group=Debian directory=/srv/keyring.debian.org/mail" - when "master.debian.org" then "debian.org: user=debian group=Debian directory=/org/debian.org/mail -debian.com: user=nobody group=Debian directory=/org/star.debian.star/ -debian.net: user=nobody group=Debian directory=/org/star.debian.star/ -debian.eu: user=nobody group=Debian directory=/org/star.debian.star/" + when "master.debian.org" then "debian.org: user=debian group=Debian directory=/srv/debian.org/mail +debian.com: user=nobody group=Debian directory=/srv/star.debian.star/ +debian.net: user=nobody group=Debian directory=/srv/star.debian.star/ +debian.eu: user=nobody group=Debian directory=/srv/star.debian.star/" when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/" diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 823a38383..d41f65794 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -21,14 +21,14 @@ class ferm::per-host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', - # quantz, wagner - rule => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 ))' + # quantz, wagner, master + rule => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 82.195.75.110/32 ))' } @ferm::rule { 'dsa-postgres-udd6': domain => '(ip6)', description => 'Allow postgress access', # quantz - rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 ))' + rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 ))' } } grieg: { diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index 3cca00aef..b03fb267f 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -5,10 +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 +#master.debian.org: +# - source_bind_port: 5441 +# target_host: samosa.debian.org +# target_port: 5441 samosa.debian.org: - source_bind_port: 5433