X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Fmanifests%2Fbackup_source.pp;h=d843243f2669f60424fc255e785873a8b9b79e6b;hb=06d5a4b60525258ffd7f4ad8d350a0785a249bf5;hp=363c8905ec27c37660b5f6615064ab69f207833d;hpb=e6316da9090883edcf647f848a575e86aa1db8d7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 363c8905e..d843243f2 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -2,70 +2,18 @@
 # See dsa-wiki input/howto/postgres-backup.creole for some documentation
 #
 class postgres::backup_source {
-	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",
-	}
-	file { "/etc/dsa/pg-backup-file.conf":
-		content => template('roles/postgresql_server/pg-backup-file.conf.erb'),
-	}
+  file { '/usr/local/bin/pg-backup-file':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/backup_source/pg-backup-file',
+  }
+  file { '/etc/dsa/pg-backup-file.conf':
+    content => template('postgres/backup_source/pg-backup-file.conf.erb'),
+  }
 
-	ssh::keygen {'postgres': }
-
-
-	if $::hostname in [melartin, 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 [melartin, vittoria, godard, buxtehude, danzi, postgresql-manda-01] {
-		postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-		}
-	}
+  file { '/usr/local/bin/pg-receive-file-from-backup':
+    mode   => '0555',
+    source => 'puppet:///modules/postgres/pg-receive-file-from-backup',
+  }
 
+  ssh::keygen {'postgres': }
 }