From 58529303e11dc022f7db888ade308a4edb700177 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 29 Sep 2017 20:00:30 +0200 Subject: [PATCH] update ferm rules for postgresql@danzi --- modules/ferm/manifests/per_host.pp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index df3ce30a5..1bd562810 100644 --- a/modules/ferm/manifests/per_host.pp +++ b/modules/ferm/manifests/per_host.pp @@ -258,7 +258,7 @@ class ferm::per_host { } danzi: { @ferm::rule { 'dsa-postgres-danzi': - # ubc, wuit + # ubc, wuiet description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))' } @@ -270,15 +270,11 @@ class ferm::per_host { @ferm::rule { 'dsa-postgres2-danzi': description => 'Allow postgress access2', - rule => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 209.87.16.0/24 ))' - } - @ferm::rule { 'dsa-postgres3-danzi': - description => 'Allow postgress access3', - rule => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 209.87.16.0/24 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))' } - @ferm::rule { 'dsa-postgres4-danzi': - description => 'Allow postgress access4', - rule => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 209.87.16.0/24 ))' + @ferm::rule { 'dsa-postgres2-danzi6': + description => 'Allow postgress access2', + rule => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))' } @ferm::rule { 'dsa-postgres-backup': @@ -290,6 +286,15 @@ class ferm::per_host { description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } + @ferm::rule { 'dsa-postgres2-backup': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V4 ))' + } + @ferm::rule { 'dsa-postgres2-backup6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V6 ))' + } } seger: { @ferm::rule { 'dsa-postgres-backup': -- 2.20.1