From 73ec3c6cb0d17ac675892da9bfa986ebf510f859 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 16 Oct 2018 15:54:16 +0200 Subject: [PATCH] merge ipv4 and ipv6 rule for ullmann's dsa-postgres-udd rule --- modules/ferm/manifests/per_host.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index 7d38e4af8..5f54f494e 100644 --- a/modules/ferm/manifests/per_host.pp +++ b/modules/ferm/manifests/per_host.pp @@ -128,13 +128,13 @@ class ferm::per_host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', + domain => '(ip ip6)', # quantz, master, coccia - rule => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 82.195.75.110/32 5.153.231.11/32 ))' - } - @ferm::rule { 'dsa-postgres-udd6': - domain => '(ip6)', - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/128 ))' + rule => '&SERVICE_RANGE(tcp, 5452, ( + 5.153.231.28/32 2001:41c8:1000:21::21:28/128 # quantz + 82.195.75.110/32 2001:41b8:202:deb:216:36ff:fe40:4001/128 # master + 5.153.231.11/32 2001:41c8:1000:21::21:11/128 # coccia + ))' } } fasolo: { -- 2.20.1