From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Sep 2019 16:23:48 +0000 (+0200)
Subject: Move the backup of the pg instance on buxtehude to a more hiera and facter based... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3ce2886f72d5c9d9afde17e9adc6b9ce80a16023;p=mirror%2Fdsa-puppet.git

Move the backup of the pg instance on buxtehude to a more hiera and facter based setup
---

diff --git a/data/nodes/buxtehude.debian.org.yaml b/data/nodes/buxtehude.debian.org.yaml
index 498ea1454..b420bbdaf 100644
--- a/data/nodes/buxtehude.debian.org.yaml
+++ b/data/nodes/buxtehude.debian.org.yaml
@@ -1,6 +1,7 @@
 ---
 classes:
   - roles::bugs_master
+  - roles::postgresql::server
 
 apache2::smaller_number_of_threads: true
 # debbugs cgis like to fork and don't deal well with EAGAIN
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index b11d634f1..97fccceec 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -17,17 +17,6 @@ class postgres::backup_source {
   ssh::keygen {'postgres': }
 
 
-  if $::hostname in [buxtehude] {
-    postgres::backup_cluster { $::hostname:
-      pg_version => '11',
-      pg_port    => 5433,
-    }
-    postgres::backup_cluster { "${::hostname}-debbugs":
-      pg_version => '11',
-      pg_port    => 5441,
-      pg_cluster => 'debbugs',
-    }
-  }
   if $::hostname in [danzi] {
     postgres::backup_cluster { $::hostname:
       pg_version => '9.6',
@@ -58,7 +47,7 @@ class postgres::backup_source {
     }
   }
 
-  if $::hostname in [godard, buxtehude, danzi, postgresql-manda-01] {
+  if $::hostname in [godard, danzi, postgresql-manda-01] {
     postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
     }
   }