X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=304e7d6cdd736fbdad4b4c2eeb3446273a0dc16e;hb=015fa6b401098df522b1adf8e574a88d581ef340;hp=97fccceecc4b2caa3d17fdc4c22f9ac798a32479;hpb=3ce2886f72d5c9d9afde17e9adc6b9ce80a16023;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 97fccceec..304e7d6cd 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -2,53 +2,20 @@
 # See dsa-wiki input/howto/postgres-backup.creole for some documentation
 #
 class postgres::backup_source {
+  include postgres::backup_server::register_backup_clienthost
+
   file { '/usr/local/bin/pg-backup-file':
     mode   => '0555',
-    source => 'puppet:///modules/roles/postgresql_server/pg-backup-file',
-  }
-  file { '/usr/local/bin/pg-receive-file-from-backup':
-    mode   => '0555',
-    source => 'puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup',
+    source => 'puppet:///modules/postgres/backup_source/pg-backup-file',
   }
   file { '/etc/dsa/pg-backup-file.conf':
-    content => template('roles/postgresql_server/pg-backup-file.conf.erb'),
+    content => template('postgres/backup_source/pg-backup-file.conf.erb'),
   }
 
-  ssh::keygen {'postgres': }
-
-
-  if $::hostname in [danzi] {
-    postgres::backup_cluster { $::hostname:
-      pg_version => '9.6',
-      pg_port    => 5433,
-    }
-    postgres::backup_cluster { "${::hostname}-tracker":
-      pg_version => '9.6',
-      pg_port    => 5432,
-      pg_cluster => 'tracker',
-    }
-    postgres::backup_cluster { "${::hostname}-debconf":
-      pg_version => '9.6',
-      pg_port    => 5434,
-      pg_cluster => 'debconf',
-    }
-    postgres::backup_cluster { "${::hostname}-wannabuild":
-      pg_version => '9.6',
-      pg_port    => 5436,
-      pg_cluster => 'wannabuild',
-    }
-  }
-
-  if $::hostname in [postgresql-manda-01] {
-    postgres::backup_cluster { "${::hostname}-bacula":
-      pg_version => '11',
-      pg_port    => 5432,
-      pg_cluster => 'bacula',
-    }
+  file { '/usr/local/bin/pg-receive-file-from-backup':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/pg-receive-file-from-backup',
   }
 
-  if $::hostname in [godard, danzi, postgresql-manda-01] {
-    postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-    }
-  }
+  ssh::keygen {'postgres': }
 }