From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 16 Sep 2019 22:41:32 +0000 (+0200)
Subject: wannabuild has been moved from bmdb1 to danzi
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=9a69220cc9cf9388a8336e0c4fd65489e8933367

wannabuild has been moved from bmdb1 to danzi
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 2da64cd5f..d139e87d2 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -151,18 +151,6 @@ class ferm::per_host {
           ))
           | EOF
       }
-      ferm::rule { 'dsa-postgres-wannabuild':
-        description => 'Allow postgress access to cluster: wannabuild',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5436, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
-            \$HOST_PGBACKUPHOST
-          ))
-          | EOF
-      }
       ferm::rule { 'dsa-postgres-bacula':
         description => 'Allow postgress access to cluster: bacula',
         domain      => '(ip ip6)',
@@ -215,6 +203,18 @@ class ferm::per_host {
         description => 'Allow postgress access2',
         rule        => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
       }
+      ferm::rule { 'dsa-postgres-wannabuild':
+        description => 'Allow postgress access to cluster: wannabuild',
+        domain      => '(ip ip6)',
+        rule        => @("EOF"/$)
+          &SERVICE_RANGE(tcp, 5436, (
+            ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+            ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+            ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+            \$HOST_PGBACKUPHOST
+          ))
+          | EOF
+      }
     }
     seger: {
       ferm::rule { 'dsa-postgres-backup':
diff --git a/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb b/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
index ae828666d..bd82fda7d 100644
--- a/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
+++ b/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
@@ -11,8 +11,8 @@ backups:
     snapshot:
   danzi:
     main:
-  bmdb1:
     wannabuild:
+  bmdb1:
     main:
     debsources:
       retention: 1209600
diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index b0e65efff..c3bc1c9f3 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -162,7 +162,7 @@ while read host port username  cluster version; do
 done << EOF
 seger.debian.org	5432	debian-backup		dak		9.6
 bmdb1.debian.org	5435	debian-backup		main		9.6
-bmdb1.debian.org	5436	debian-backup		wannabuild	9.6
+danzi.debian.org	5436	debian-backup		wannabuild	9.6
 bmdb1.debian.org	5440	debian-backup		debsources	9.6
 fasolo.debian.org	5433	debian-backup		dak		9.6
 sallinen.debian.org	5473	debian-backup		snapshot	9.6