From: Julien Cristau <jcristau@debian.org>
Date: Mon, 23 Sep 2019 11:50:37 +0000 (+0200)
Subject: bacula cluster moved to postgresql-manda-01
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2c98db46d913527bc8df135f1720698e1002a920;p=mirror%2Fdsa-puppet.git

bacula cluster moved to postgresql-manda-01
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 10b99f8c9..ed818f12d 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -146,17 +146,6 @@ class ferm::per_host {
           ))
           | EOF
       }
-      ferm::rule { 'dsa-postgres-bacula':
-        description => 'Allow postgress access to cluster: bacula',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5437, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
-            \$HOST_PGBACKUPHOST
-          ))
-          | EOF
-      }
       ferm::rule { 'dsa-postgres-dedup':
         description => 'Allow postgress access to cluster: dedup',
         domain      => '(ip ip6)',
@@ -217,6 +206,19 @@ class ferm::per_host {
           | EOF
       }
     }
+    postgresql-manda-01: {
+      ferm::rule { 'dsa-postgres-bacula':
+        description => 'Allow postgress access to cluster: bacula',
+        domain      => '(ip ip6)',
+        rule        => @("EOF"/$)
+          &SERVICE_RANGE(tcp, 5432, (
+            ${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
+            ${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
+            \$HOST_PGBACKUPHOST
+          ))
+          | EOF
+      }
+    }
     seger: {
       ferm::rule { 'dsa-postgres-backup':
         description => 'Allow postgress access',