From 23acc7ea320ba6a6876c3e08e1578aaec77b4e23 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 3 Sep 2017 14:23:26 +0200 Subject: [PATCH] Start moving vittoria over to puppetized pg backup --- .../templates/backup_server/dsa-check-backuppg-manual.conf.erb | 2 -- .../templates/backup_server/postgres-make-base-backups.erb | 1 - modules/postgres/templates/backup_server/sshkeys-manual.erb | 1 - 3 files changed, 4 deletions(-) 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 11b1980e3..cffcfd405 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,8 +19,6 @@ backups: debsources: seger: dak: - vittoria: - main: 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 b9f781b6d..d864313c8 100755 --- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb +++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb @@ -96,7 +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 -vittoria.debian.org 5432 debian-backup main 9.6 buxtehude.debian.org 5433 debian-backup main 9.4 buxtehude.debian.org 5441 debian-backup debbugs 9.6 <%- if @hostname != "backuphost" -%> diff --git a/modules/postgres/templates/backup_server/sshkeys-manual.erb b/modules/postgres/templates/backup_server/sshkeys-manual.erb index 74a336b43..90d173ab0 100644 --- a/modules/postgres/templates/backup_server/sshkeys-manual.erb +++ b/modules/postgres/templates/backup_server/sshkeys-manual.erb @@ -8,6 +8,5 @@ command="/usr/local/bin/debbackup-ssh-wrap chopin",no-port-forwarding,no-X11-for command="/usr/local/bin/debbackup-ssh-wrap lw07 --read-allow=/srv/backups/pg/sibelius",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="185.17.185.187,2001:1af8:4020:b030:deb::187" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiLZIqnyKrsfoT1sQdbuUsOoqW1t71Sv8hpJj9yLzrSFq/YCnho9G2Q/LJm4sMB4W64uQMUX6oLsqsgIBbOZw71CBRou41zwS/D+7+sjiPy1aVXp+L+fAXqLdemCUYqXAm0bGTLboGmlDSG3/r3v3B2+vqwAoHaC/GwuoNgvHq+sfxZPo/9cDRlTyE0ktyxwdUN+czxyLtDPqz3CucOHX03p8F3lNEwFUCGIVAkP4zxZsiEjD+eCbWam0bVFoWnfXYcmf2GYKEy2PQp0ksXmbsnRIblW5zoKdEXeDjwSStFHtjqkJw2TdPLUGSXljCgy9OCXYVMUrFnXw2Ak88KYpV postgres@lw07 (20140713) 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 vittoria",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="194.177.211.205,2001:648:2ffc:deb::211:205" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt6mkkUqyWwiGbgviBx9BWlLrq92+T6wHEH8tHjEpIsLWgkRb5LtAsBl/h3yDwlYDoHc0Pqh8BD2G582M42AfcN8MTlggi9CkcorHatXJlvNsS6OjdIylwWASa/I6h4Q5i2ird4ujO2Zz+1XFcqZaCNiuvz1sF21f4qh0CEqWKQv9Xz0GDsGWIADWIkVium1n6wwZWMR/O/PmrpE7AZ8WR2K5FDgQ1NL76sM8u/V1STaOyr3/uv8xTZL5Rcj/Aw7/7/TnENdD2PC8/5Yd55+H6gPAGvCcsgL4X3jMf0dzNEK/wfPNfCJLeQjmJufld8d+Hw1yz0znBpl8iliUfRW6B postgres@vittoria (20151226) 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) -- 2.20.1