From: Peter Palfrader Date: Fri, 1 Sep 2017 17:15:51 +0000 (+0000) Subject: manual entries for melartin for fw, authkeys, and make-base-backup should no longer... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c1f216790d3a69239fb0b84cbb9cd50743ed5f0c;p=mirror%2Fdsa-puppet.git manual entries for melartin for fw, authkeys, and make-base-backup should no longer be necessary --- diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index 3118efc21..8892b6c14 100644 --- a/modules/ferm/manifests/per_host.pp +++ b/modules/ferm/manifests/per_host.pp @@ -339,7 +339,7 @@ class ferm::per_host { rule => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))' } } - melartin,vittoria: { + vittoria: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' 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 655603551..b9f781b6d 100755 --- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb +++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb @@ -97,7 +97,6 @@ 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 -melartin.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 fa06378ff..74a336b43 100644 --- a/modules/postgres/templates/backup_server/sshkeys-manual.erb +++ b/modules/postgres/templates/backup_server/sshkeys-manual.erb @@ -10,5 +10,4 @@ command="/usr/local/bin/debbackup-ssh-wrap moszumanska",no-port-forwarding,no-X1 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 melartin",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,from="194.177.211.208,2001:648:2ffc:deb::211:208" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYcmvkbBM7bW8+sTeKd0+zBbUX7mMsOPaDd6jlu/+VFfFQHWkz0iJrsOxpIHW/g+PvgNciypannGc4sjud/nGkBE1vZzzbyOxXCm6zIJkMuxhqdvCXtl91yzLx884ioAwWEpi5jc24e2Xe9kHCdl5AybTBQbqz9x3yVtXDx6TjOrncZpG1yj3DsNw3aOZdlGvKVjZ4dqIlF7bT2KE2JnKfvviF3AQet2f7D7Je/sIkfsSHYM20h+KD1jeYnSY3Y3X1uUWZkaeQqt+DUGL+QtQGStVOE5nFgUV1tVZfrUs8tAJlrQs9o0pu6NkSplMbQY/pe68kSrQY0hV/IxMAywqx postgres@melartin (2017-02-26) 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)