From f9cd82915b4f9db0e26a33578dfe021acf0a5655 Mon Sep 17 00:00:00 2001 From: =?utf8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= Date: Wed, 9 Jul 2014 00:58:09 +0200 Subject: [PATCH] ferm: update -ports rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Héctor Orón Martínez --- modules/ferm/manifests/per-host.pp | 8 ++++---- modules/ferm/templates/defs.conf.erb | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 78b47b03..7164206c 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -292,12 +292,12 @@ class ferm::per-host { bmdb1: { @ferm::rule { 'dsa-postgres-main': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 ))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32))' } @ferm::rule { 'dsa-postgres-main6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))' } @ferm::rule { 'dsa-postgres-dak': description => 'Allow postgress access', @@ -321,12 +321,12 @@ class ferm::per-host { @ferm::rule { 'dsa-postgres-wanna-build-ports': # portman description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5438, ( 5.153.231.29/25 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.29/32 ))' } @ferm::rule { 'dsa-postgres-wanna-build-ports6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5438, ( 2001:41c8:1000:21::21:29/64 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:29/128 ))' } @ferm::rule { 'dsa-postgres-bacula': # dinis diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 17070a9d..d0e4b148 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -132,6 +132,7 @@ @def $BUILDD_SSH_ACCESS = (); @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet +@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.29); # portman @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master -- 2.39.2