merge ipv4 and ipv6 rule for ullmann's dsa-postgres-udd rule

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 7d38e4a..5f54f49 100644 (file)
--- 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: {