RT#7513 Get rid of most traces of moszumanska

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7ff531e..ca1650b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -243,7 +243,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 39b7be0..5a8aa83 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -100,10 +100,6 @@ class postgres::backup_server {
                content => template('postgres/backup_server/dsa-check-backuppg-manual.conf.erb'),
                notify => Exec['update dsa-check-backuppg-manual.conf']
        }
-       file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/moszumanska.conf':
-               ensure => 'absent',
-               notify => Exec['update dsa-check-backuppg-manual.conf']
-       }
        File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
        ensure_packages ( "libhash-merge-simple-perl", { ensure => 'installed' })
        exec { "update dsa-check-backuppg-manual.conf":

diff --git a/modules/postgres/templates/backup_server/sshkeys-manual.erb b/modules/postgres/templates/backup_server/sshkeys-manual.erb
index 34bebb4..01f7a6e 100644 (file)
--- a/modules/postgres/templates/backup_server/sshkeys-manual.erb
+++ b/modules/postgres/templates/backup_server/sshkeys-manual.erb
@@ -5,7 +5,6 @@ command="/usr/local/bin/debbackup-ssh-wrap bmdb1 --read-allow=/srv/backups/pg/fa
 command="/usr/local/bin/debbackup-ssh-wrap danzi",restrict,from="2607:f8f0:614:1::1274:30,209.87.16.30" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUMgnFZUkYiX8ldYKmiX91Z+CD67dhgyq+3CLW3T2Rn+L8yzsZwT+qU0FCPTOz2RTVI1UUlrAST2u1Zcx9Ys3/8qegQ8LTX/Nu2SEVVVeWOgYAbC2HINfmKELEZh77te1te+wyGoGuXIBlIBiUr5+VtzWPWDY08E6xQf1Y2hCUV4ZOYH6//vM1nKldT588r05hoIgX1um1GKfmGXAVS0z2qcZbRR8mCxrNyIV23pM28urJgF4LgqQFk3chRkyv/Yq7Han4aqnUg32S21bAMsH47B00+wk4zkRoTxyF6TeO6/WsAM1cezx7fMwODd/Ipn6miLtkb1SVgDP/qP1ironZ postgres@danzi (20101211)
 command="/usr/local/bin/debbackup-ssh-wrap chopin",restrict,from="2001:8d8:580:400:6564:a62::3,195.20.242.124" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtJ54j48JZRNVRaCeIsRwuw3/gfBgpz9TCR1PUd+NfugscrR9xlYAac+DD7GuGkVb1FZuZLGTkrrg+Ziis5ZOEaib/WxjmdTM0FLLw+3shTaBbPP4snWj+H31wA+SS6b9bqVikaZYq3ZRO3Nt8eScphpoU4sw3BgUGE+lNgjFCx+Y6zasRon/KU+YKHtKYKMg/8Ams551oaCBPP0tXGWAeoiDAHq/PUWaaK4jyu+a2BAP/fQ2OovXsM6t+0pRpdtxCBV1kgKtgJnbV1xEFpFRvpBMQv+BQb8M4eVUJ1DgyOT4Ew3Zl1XYNvCT/YMoYOElOmRio1aD9+dh7CZCfWlYMw== postgres@chopin (20101213)
 command="/usr/local/bin/debbackup-ssh-wrap lw07 --read-allow=/srv/backups/pg/sallinen",restrict,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",restrict,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",restrict,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",restrict,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 sallinen",restrict,from="193.62.202.26,2001:630:206:4000:1a1a:0:c13e:ca1a" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+kslXxLI6dGRSJoHKnKpWMcTdvlMM4KbrPPDzhijemmxo2lpMRSuvzc98UE2zy4fDSWFbid1drf8XC/BwwNRLnJGFcMjJ42JcDBz9zALQfgmhFzgxFRJFsHgXxq/GJNqvq9i2Mk1dV8wpQgJNToYU5XHJjkLCT2ucV9jUZ1ZRFaLxrnM7uMXPH8HJ1vqTRHMrq/YghUMJHDBLK8ukChs2uEOYJxODJkYdbSFUC//KVScFnDC0WhhDtjCuIn4USY3KNJ9GrxhNSFc/O0XWKFAc2ntzk0d7WDH6O+9izkesXugq/ICFmDIGu4OXCnQYWdQQVsaAlFkD5lgbcw+7wG77 postgres@sallinen (2018-01-04)

diff --git a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
index e504835..12492f3 100644 (file)
--- a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
+++ b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
@@ -25,8 +25,6 @@ callers = []
     end
 end
 
-# callers << { 'node' => 'moszumanska.debian.org', 'addr' => allnodeinfo['moszumanska.debian.org']['ipHostNumber'], 'key' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXHFIkIhOC5iDa0d0IN5w6tUUL2T2iXCYcS2+dandE9f550OpKQ/evUZhw4EERNYDA3G7GV3jJzQR0j/KZWJUtDCichmqS94xJqXURmZVNeLXWY9x/N7CB1iG1Iblu6sgyTUrs7N6Wb0fUab3AXAi9KIXdwNLY622reR9T//bRULPVIl5VFpYtGBPT9n3wR7fLQ4ndEcUmEGcM4jRbpLmye4QGgJotuzeBWUpX+U648Yly6U7NlAJIWPUt7hEzMz2AC81SLhGCwTk6sb19n2dO6WN2ndynp8PLG1emtgd1/DaeaRyPcitoWgSoDNgKNk3zLIDtCdSYvFI8xXrm6cK3 staticsync@wagner'}
-
 lines = []
 for m in callers do
     lines << '# ' + m['node']