From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 28 Sep 2019 09:27:19 +0000 (+0200)
Subject: ferm@serger: merge dsa-postgres-backup and dsa-postgres-backup6
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7d26559131d4900e63edae21954e5604ae1ff8d4;p=mirror%2Fdsa-puppet.git

ferm@serger: merge dsa-postgres-backup and dsa-postgres-backup6
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index f3db6ff8a..2e995dcfd 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -222,12 +222,8 @@ class ferm::per_host {
     seger: {
       ferm::rule { 'dsa-postgres-backup':
         description => 'Allow postgress access',
-        rule        => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
-      }
-      ferm::rule { 'dsa-postgres-backup6':
-        domain      => 'ip6',
-        description => 'Allow postgress access',
-        rule        => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
+        domain      => '(ip ip6)',
+        rule        => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST ))'
       }
     }
     sallinen: {