From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 5 Sep 2017 08:23:53 +0000 (+0000)
Subject: switch buxtehude to more puppetized pg backups
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3a98269574ed3307cdfd60345e07b56108ef2071;p=mirror%2Fdsa-puppet.git

switch buxtehude to more puppetized pg backups
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 2c339ae2e..df3ce30a5 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -333,17 +333,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
 			}
 		}
-		buxtehude: {
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-		}
 		default: {}
 	}
 	# vpn fu
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index eec6405a2..835d214d1 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -25,8 +25,19 @@ class postgres::backup_source {
 			pg_version => '9.6',
 		}
 	}
+	if $::hostname in [buxtehude] {
+		postgres::backup_cluster { $::hostname:
+			pg_version => '9.6',
+			pg_port => 5433,
+		}
+		postgres::backup_cluster { "${::hostname}-debbugs":
+			pg_version => '9.6',
+			pg_port => 5441,
+			pg_cluster => 'debbugs',
+		}
+	}
 
-	if $::hostname in [melartin, vittoria, godard] {
+	if $::hostname in [melartin, vittoria, godard, buxtehude] {
 		postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
 		}
 	}
diff --git a/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb b/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
index cffcfd405..82c9ca5fb 100644
--- a/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
+++ b/modules/postgres/templates/backup_server/dsa-check-backuppg-manual.conf.erb
@@ -19,6 +19,3 @@ backups:
     debsources:
   seger:
     dak:
-  buxtehude:
-    main:
-    debbugs:
diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index d864313c8..a54e803c7 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -96,8 +96,6 @@ bmdb1.debian.org	5440	debian-backup		debsources	9.4
 danzi.debian.org	5433	debian-backup		main		9.4
 fasolo.debian.org	5433	debian-backup		dak		9.4
 sibelius.debian.org	5433	debian-backup		snapshot	9.4
-buxtehude.debian.org	5433	debian-backup		main		9.4
-buxtehude.debian.org	5441	debian-backup		debbugs		9.6
 <%- if @hostname != "backuphost" -%>
 moszumanska.debian.org	5432	debian-backup		main		9.1
 <%- end -%>
diff --git a/modules/postgres/templates/backup_server/sshkeys-manual.erb b/modules/postgres/templates/backup_server/sshkeys-manual.erb
index 90d173ab0..0c58491aa 100644
--- a/modules/postgres/templates/backup_server/sshkeys-manual.erb
+++ b/modules/postgres/templates/backup_server/sshkeys-manual.erb
@@ -9,4 +9,3 @@ command="/usr/local/bin/debbackup-ssh-wrap lw07 --read-allow=/srv/backups/pg/sib
 command="/usr/local/bin/debbackup-ssh-wrap moszumanska",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="5.153.231.21,2001:41c8:1000:21::21:21" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD7mdgD1lNyehdDE/yBlbMUVWwNWz7Lr77sIaK61ct3UjFaYGwJZ2nMph3yylcJF1svuQUZ1qNOgZxTx2reOGMbNx1dO2q9O42z6GMoAp1QAKF43EEFJWGgQb9LCvjRZRQnK65KdP1Lv5igc+c9tFbF0y/u1sf1uMuGtBYN4r5mFbn8t1toMAxiUQJzljbRxDrLWZbEH+jwtJBxjZfpWLX9zB2dSMgIawVrTalN9r6fkWvkxC9POtqmZXGyFhljbi8vOsdFXKCs0kI3QLUyRSKvSSCN2+WstMg5hPAo6q0AplrJwilTQiyntSutd1o9KF7qQh5dSCi2yxR5d6R7jbw/ postgres@moszumanska (20150321)
 command="/usr/local/bin/debbackup-ssh-wrap seger",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="82.195.75.93,2001:41b8:202:deb::311:93" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuLyOZP0eJvTEVXoI0K5xJw2OLZkaJ3yl7Gko/YfhhBebxEB9R0xu97zkiKqitmWm61BZSapdIqlUeMd+t/UgjcqpffXkGz0nx99YZgY0lq3WA4MLZiRrZGnfSzjSvcdSFXDlmv20+txEuf05h26BJUAsjQaugNd0641WPWoLK3+sHc4ZXga7//M6bia8b7n3iYCeVc8UHyjWsSPq/+QyTa49+ZXYLIraGOpZbQG276ywLm4eDc8VWalw7mB0cWJTIM9NGTSVQPEP8bvY9MqzvmmnltjyQ4Mk+PQHobMzlb99HXMNGZpM8fpHZgLjcnCurHtFGYiMBt3MlDJzA9Egp postgres@seger
 command="/usr/local/bin/debbackup-ssh-wrap fasolo",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="138.16.160.17" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9c7cUVy40BibIwNN0cE2PMPqnU+iSLUj6SE5+2DJiDYuCoB3blFkCkQk2IjvTCAorWwDJGumH4Zu2CVtXOzwVXcxaZQCMnkOos0pTA6IaFX8FQdYTo8O9sOp/i2EWgHCD7jjzLGqXpNX7B5+kbFzQ/KX+2FgLjVob95YGid/b70XgBAeBj9RZKb4A6BmOPh9rB7a/wg/446aQlxf4+1C0kKA3Cs36yj8lNl17k+ClPcj2j0SX3vA8LjzL5sTUOco4PNg1pkOUq3rVz58UruK/4E/1Gb8r6iVjxPQvSPvKC/wlpSUNqVRJXMgxrAE+D8AXiEoMXm61eM4gcm1Mad1L postgres@fasolo (20161022)
-command="/usr/local/bin/debbackup-ssh-wrap buxtehude",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="209.87.16.39,2607:f8f0:614:1::1274:39" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0aP8ByPx6PlUoV9YaVg+dhqdf6UtF2Oi7/0DqF/3O2/AVApJK138FjhJsgIUjK3OnBn2bmbAK6xZOFXRdrB9haA69OGTQ9UkdTjJkdl5VdbwECdHudXy49bGHagHBlhTSWIPzT0JabHKHGzog8tkTKYgF8QT0nYthWzqIk83fVDNoO0+6GiZ2Ja/315N4Jyv3MeOZ/xHExeakDhX5P3bOYD96jCqtzBgiC6zbcCnkQwPozEDOk2iblmEPWTjIHzFuGoKHi10nbHOiYh6d07Cys+lfc49iFde8pwyxF0UTph52+srEHyW8zG+ezUxNqb+fvfK0ixpfQ1zX+fUumLaN postgres@buxtehude (2017-02-27)