From: Julien Cristau <jcristau@debian.org>
Date: Sun, 1 Oct 2017 18:20:15 +0000 (+0200)
Subject: Use postgres::backup_source for danzi's main pg cluster
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5ba716ac2516f8c11d92c5d8d3159ab21bd3a856;p=mirror%2Fdsa-puppet.git

Use postgres::backup_source for danzi's main pg cluster
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 567e4e65b..e052c4a4c 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -277,25 +277,6 @@ class ferm::per_host {
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
 			}
-
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-			@ferm::rule { 'dsa-postgres2-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres2-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
 		}
 		seger: {
 			@ferm::rule { 'dsa-postgres-backup':
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 0c9407bd9..06d2dd32e 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -37,6 +37,10 @@ class postgres::backup_source {
 		}
 	}
 	if $::hostname in [danzi] {
+		postgres::backup_cluster { $::hostname:
+			pg_version => '9.6',
+			pg_port => 5433,
+		}
 		postgres::backup_cluster { "${::hostname}-debconf":
 			pg_version => '9.6',
 			pg_port => 5434,