X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=e642ca732d0cc2fad8f5f467a773333d9884736d;hb=e9e6c1abe830ad5d653c9afd237f437fb07ee3ed;hp=663a6b490e4a67f296b158bdb2ba48f3f5554510;hpb=c0edb244080f29970251618cf4452c3fafeb7677;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 663a6b490..e642ca732 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -4,67 +4,16 @@
 class postgres::backup_source {
   file { '/usr/local/bin/pg-backup-file':
     mode   => '0555',
-    source => 'puppet:///modules/roles/postgresql_server/pg-backup-file',
+    source => 'puppet:///modules/postgres/backup_sources/pg-backup-file',
   }
+  file { '/etc/dsa/pg-backup-file.conf':
+    content => template('postgres/backup_sources/pg-backup-file.conf.erb'),
+  }
+
   file { '/usr/local/bin/pg-receive-file-from-backup':
     mode   => '0555',
     source => 'puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup',
   }
-  file { '/etc/dsa/pg-backup-file.conf':
-    content => template('roles/postgresql_server/pg-backup-file.conf.erb'),
-  }
 
   ssh::keygen {'postgres': }
-
-
-  if $::hostname in [vittoria] {
-    postgres::backup_cluster { $::hostname:
-      pg_version => '9.6',
-    }
-  }
-  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',
-      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',
-    }
-  }
-
-  if $::hostname in [vittoria, godard, buxtehude, danzi, postgresql-manda-01] {
-    postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-    }
-  }
 }