cleanup ssh config, remove unused keys

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/homedir/ssh/ftpmaster-authorized_keys b/config/homedir/ssh/ftpmaster-authorized_keys
index a4423b5dc0dc429c5f7254e4a636214127e91fd0..c04539f700a988c7bab01cad2d3e818e67c90ac8 100644 (file)
--- a/config/homedir/ssh/ftpmaster-authorized_keys
+++ b/config/homedir/ssh/ftpmaster-authorized_keys
@@ -1,21 +1,7 @@
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/backup/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAn5Rt1a5lewrIi598AXi2zwen7JEiq4gLOCeiZYRx3GEZ1Uy+RZZBh/WM1I3msMTQQ07gRwvhNp19HuCuZMQAvFi+0MiRcikyMXun/qgRmlg5uUrAIP+066K9ix4K82krrzg54/UNX35T7eQ4parK+FoMxdI+Z9MIEHAcSFHhWymAj40sF9L9Uzzh1GBP+pphasuj6EtPJaY+9+sgCPVP16ZHPZmHZQAKsWd9ODiZ7KDsEdXDtXWZrHomBeU/lBP1pkgd+8QvtNOlluFgpwfeKbuVSb59n7zBBEfRu3wAXdqc9wuzz4ch74zHjgFFWNhFsF+2lFEUCLugsV5TLM6nDw== dak sync backup
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/database/dists/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAu6aXFW64AnbdOUfqT3adMIo0r3osdn6czxLs9X72f4hMWBZCdbjTbSsf8TUwCmrrDQe9KW2nWb7Uzqh914jIVKNrnOCLRxRlC9nSOC5PX8uiZjiNPA+gyHo1u/xhQBql+4gv32TkB26yu5k7W/qc+bmOJaOiC1+KRZDIrta4dqDeDejRJlyxwLQS6+/Fb3z4U8qs0Pcr5VTG/J+CnhVWHTotX6hJq8h18nmNSchJm2+Exre7Cmn/d1TXCFUV+eI+WkrNaLfZUN3BhYS+1feZ2YTyaGZL/UQ3LZpFe/BmJ2vltAOy+/o0ICOGs9IpTflmV35lxtmEKXVnVENI7SHi7w== dak sync database/dists
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/log/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAr25amLn3qRUyeUdnTcIn9PviVxQsC2TwfdO68zwRqqsnWw3WDpZcSTwtgLoVcjBNt5f1Dbk/E+exViv2OcR8WKapyHiYJKY7MnnPHQdO/I4qNA2F8NuJC79++sCtXXqNiLctkjgRNom0zsOBsf/s3v9QDHuTbnuZhKEAl6jouJbMGnrNFwB0aCTZq0cIVWp/QsstbgxN/cA8zT6uoM4hR0gldMNQWo602Dcyxu7XoxCp6dob3Fx1ex8cdrR7lr0WMqINB0z7d/gyEq8e8MvcJV0C1rryr7Wq7iGJGGvV+JR7n38aFAOJ5Sb3Mwy+KLX1yGw4rh1Gf3nKH2wAh3/17w== dak sync log
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/dak/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsaYegb+YSUWEmrcdM4baFMQMFUTnvwzHVC4osE60V6wQOmyhfpzzsdiQKblFZo9aGPkPalEqK137v2MnPRXXtnSH2/Kjc2B7Q18nKC/GjzUd3q7nz5bkeU1SgQV2IG4ilFnbc6uX7ySfTpzwmh4oitXCmOL8mAwT6cDnL+CXLoEjk+LTk2zWouaYhq2eZjRjXTKcNQfc2leg723oxzLrsqWOVm9bKZuPEIM3ZeHBRHNTzuJ13ujJtTaMZxgG9r7PP3uuTcVB2BF2Y53fJdL28X2BNfZoeYIzLjtyCpyUh3n4b9Rv5RiJz+VGIh+de72YuLcdJQAACFAGrr/zwK+m7Q== dak sync dak
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/mail/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0ipZHMcriUhaUdAL/5TjoKNf2Sov3HcDwdEM4TrkmwOMlmiQYLxRHHscBMeobB6TgYXOT9xpRcg5BW+rhZwtcnLNmKcoK6YqTu3BnJfn/xGCq82juGsw9hB8dzunFWppQrE79GxDX1+vbzWFyTzbGirE/JieVaf9gret7llJaNGCSH/zDKFeREUs/79QYibp3sH03EMdKs7LyrvSul1wYK1OPozwmGo4+FWrrBA1xXIQeQpZaC5/6NHOQR7/Py9fzIzfmzebeDpCcgIxtZ9tvaBJXKAFO3A9GIBNxSse5KwoH08WgneAlZEKs0xNngNQIvd9qX+f/lHkeF+R5H8QGw== dak sync mail
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/misc/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsRj3jE/x1RNZUXybt8M00ShcC5mDuu1NpFavjzIM6NNY5Dh+Vl9HMmmXbSe7Fdnm3qpTxcfaRhcgCh6jHx8AQQoS+ccgowP2VhlxKJv47a3YErkZ7iLaqtfl/cT7cHbZfD5Xeh3vdKhX2V72Y/GgDZ69J/DTmuo4WrbMUowK6SqbJYYG0vnIkJOnC8CZeg5OwinynYtg5RAHKO4Tf1U0fi2h9jq8m/SM9MVO1ikljsomKg3RvJeuIPQpCTEJFWkXPMeb6ajyH7Oz3sUGr+ICAX1gcImucRnZxnnldBy7F+yBrmcReLyOhPYW9hduqz3Mf+8MLwQV+V8Kj536mJQj3Q== dak sync misc
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/relscan/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxOPZE2eA2AaJdlJqWei5qgpTtYM5iat5JKzg0DCCqUXkjBIwCzNnMTnCvR2Otsss8JltH7wYfushPKlyFbZ5JzbOLfr0VFnNutLqCS6McXi2x03B7sY9GFeyixisdYP43+BAZzBbNJc6N2cltsUUmuOUY77I9DVmZHZL1Mj3FuYtdq0ho9j6O1yF5oPN4w40SO+YRVJGIZKBzEsYkyzuHcqs85pEJCi6Cg+DZ7c21627d6ZP2TiPFUEPOvdC+WHLPw9ac+jd4Ly/JT8tHaN8h11Hn1vADe3LJcVvpnmmEJG4qP3lgA6RJBTjkK5Bup/E183PPYsFAtfQsyEcNFDJeQ== dak sync relscan
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/scripts/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA7k1/p55unuOE0T4v+WCkQnlfjWELChfG/TLmIDCS9Zj1g6HMbaUht1Q1yn3u35//7xeUxwqoQCnyJDKSUJXzLEwESCH6gBPIvt28mjxybpUVyfrax8VuFZIcpsCw8XUuoRr/K6LG8FwigwsH1JrKIhX5IHLm/FF63LjH6A6AOa5tJHliIBH6Cyb3ZVq8aaWBVWd2TsvQ0U2mqQjw2nvbulS07S5woOYIJm7H5Gjnhqy9VDl/W4wUKdJcLCxpokt0kn8sUlzyqcoZsRL5KrTKQc/wVkTaGaI3eARM10v2aLbGRuAcBpTPal20W43F5CE2dp3kFOiPYmALhcjfcPVR1w== dak sync scripts
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/testing/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuoYzwvfO5Wc8Hty2PGd+1Yt2C/Vgfqaf9FUYDfcl4mAf/ke9AuhMvfzwPDUw+4zpY6Z+aXlMTN3ah5yRfSHgbbsqjx8fbC6NKPalrD99AwwauLmtxzTeX4lG5Lz52/pMlbkSHuAHTHvnUo5Q87Qf/IVKA7S9FYgmaBPtsX0CT9qQDsOpmfcBlgdTV24I6XesRjM9WUqk9U/O8WQG4Pt9TTsv+HIABFPCe6Cj3WykJJSSNT28DeGPbkKrFNUZVgyZ1GHQ3ov5uCwy2YXz87P1CI6aoKadlN6nmnskDF8HO/LOLd4V40DV/+nNcrH+rQC7nVxbcvW6sHdnPWJqBY6B0Q== dak sync testing
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp.debian.org/web/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtu66KpGFbEqtIYq8mM95smdrWY/dRLLallMMxdCzFrgy/wJ6HVisTlndhPbT5hjnlRR4L2v6p2LUmNj4SoMWivtvlq4hBJGUuL1k4fi6w9yX2pjiQ2CnCMv2j0TUcwOrWQbsXi2APcHK5k2Df5f20Cxz5U9L0BCAvdQqLR56HHaWvIkb/Jovlxj/ouT4yPWbwjv5d0Z9ixdWG4wfFam2ovQFjAhBl1UA39O42mbGLW093GTuKvuQtKz+mGidBPwCIUxDEbtkSUoZExUpU6guORhmEGYsuc2gKqrd66/Ihz5QramHE5DWFJx3yiOfBAnUPkXneXSMWEOyg0ejvBdwvQ== dak sync web
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/morgue/pool/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxv+yiI+8K1j6AGBhxlhPtu5nchY2WTbs5hQiNIOcM0sY9QAeFrGnSe5SCfHanEfDvdZJD5tRnesvE7ydqrhJ9X3K/SUAXlbxcjCMTGCo8ggS4NOQSMElawbDvSJ3twydYOgBNx8qRjUUjyfMt/+I+6W/0puFWMRroKJN0ZgbDqVTWUQyj0Mxm/0sxMbEBzVi4CVqHhqILqkmEYa378L2xGbvQazxlaW57VCBx3FTkKah1A0ZB84Or5PCwkvsrh75pc7K9S5u1RlFdgY2nj6+mESfT4+CgbViit6XzlB681XKpgH0nO6EztW68HbYRfP6ZRkCIdie6VpEhe5Zgiwy+Q== dak sync morgue/pool
-command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/queue/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.25.206.16,192.25.206.16" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAseKdvN0LX4iOPdU+IkPfMmtQ8yTK37zOe/y4id3oXhwD2Se2SwRLdEXz2gHpicBetBd43jNmsYrfaB1Fjw4AAzrLaF/dMHdB5HOeBET6eK++0MQRIAIjOs14sMttdiAKAsV8euF/Qtw5vI7JpqmRs5jSGG0d8Nnn/I7MJYVlbmEbwT1Gsr/EX85KpctVfm9YRJ0tvjMCByuGmJigp9Dx5OI18+jJXG387ES4OTKsHx5kGd+rTPhwU00QXJxOSs7PTHm/aeY08p16LJtVEv5X9i8/aZmzaXsM5KGWVwL5kGBSrOJZlOcXXg40pKXxizziHgSnhJdsmUY9p5hjZFgTeQ== dak sync queue
 # projectb to flotow
 command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/backup/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="67.192.254.200" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAn4p26q4kcoqfHjbR4CXMOOppS9zR3RtCAroL1fVeWvE8U7CVowC1MP/0pq8UAaTfdflVfIYpKbl0xMxBspyxG/fOa90TaPDT9JJrZbkQj0tMfTWFVCMg5mScT0T9wPnTkXvANU28QwDSfudvwokqA0aF2jIsBZakqtULmx6r3BED02iBNZQbbc2Sf/MvfHnpgz7yGfU/NCZzdQU0/mTbL1DqVSgbmebt6MvRfYhnxm/Tw+gfLTpG0PTKTDU5NnJBG5tPgHC2vf2jqHDn1cMu9siNjPB52sG/n+KO3Deq3dXMKMjt+9VxXC2gfND6RVnZRCfwm9QByMw5eqVejEW7iw== dak@flotow - projectb 2008-11-29
 # non-s3kr1t stuff to flotow
 command="rsync --server --sender -vlogDtprz --delete . /srv/ftp-master.debian.org/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="67.192.254.200" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1viRQWCL/LNE+7Kfc/Ao+COZM4x/7TzpXtVTRgzBtaPUf6xPiec3ieYHriLNpxblNRlRrzgSu978jmNAs9yWnmaG/QvV9CMTGMyt3ZC+z7HFX6YwSz+hJOMl55myVNsWbwOCfnTmem5YFG8yJZcTREWtMW31GfSfiv64p4ths5fJCyNBGh6E3TDg1Z9PafshETXogZjn7Ff+OXvGPo/oDW+0gEGzaNK1gvIdJNkrDAzb3UGmIZ4qcKVMtJ/Oc+R0G3NBDJUlxe48ocuzu3YUernTiZgvGAmE0vNlLAeJaXvh4YRV1mxirNvPtmKX+HZfJbrq9Pmsawdt/Yl2yR9K8w== ftpmaster test machine sync
-# we need to get unchecked onto flotow, for long term tests.
-command="rsync --server --sender -vlogDtprz --remove-source-files /srv/ftp-master.debian.org/queue/uncheckedgame",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="67.192.254.200" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxQidPvqissRqgAjK+c9g7HRG88tMW5aF5iYJsz2Si17bka9YOV83mlfm3luiNv9htkTWksujTStrMDA7uSIXA3DwzW1T29DW10wih/am3Qft+PtA6trJqHScVschohSUsTekGsIEt66y0LZNCX+/mEeiyq3nfy8sLvwDpKPU2iq5qXFd7k84M2K+jdcLyuK7ySUpTk6YViv2Mh1kd9q+L+uXhmhEDPsvvT6y7kdGvbVYK36ihCNz5CE3YaMz6FydJPoWF/Ftwf41tKTpKF3eAxYgzMtEKEluoEWCrYwmKbuaybbc6yG/Qee5d4qVxsvT+SThluMKCyOfNB2qFNlvkQ== get unchecked from ries
 
 # syncing ries
 command="rsync --server --sender -vlHogDtpre.Lsf --timeout=3600 . /srv/ftp-master.debian.org/",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="128.148.34.103" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPmVHveaikQYpiufc+fkZgD+r3HJ8wCr9MCwk4kkpA5VZ5cO89+yYupZcKtyrsz34W2IB5igo/RbXrEaonAKQTVbaJPE4RAWpLlpXx6PqSsbGd1QonXXXbk3HQSjesqOEiw7KLU/m1grk5Ad9xdhY5mA2dzgZBD76JzUo8FISO4Mb4CGcWxj2n+lw0mhOftXP5WSRt28F7UFTbY+ogC8RgvXAudTC5zhZm4APcqob+kgVjneMy2xJKF+1KOW+bAtEKlKe+yMDU1zDC3etgzKYR70oiOpKIkjjYCWE17lFiVEOlXwW3rzg6U2oZF8U3NE8sTcCe7XzpCOI+bVSLm5jL ftpmaster dd access sync ries 2011-03-21
@@ -27,7 +13,3 @@ command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh squeeze
 
 # release team tpu removals
 command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="128.148.34.3,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck
-
-## get morgue/ to stabile, pull test
-#from="137.82.84.72,stabile.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2WPS8JAoVDeSeKAHtCnU4udbKlpB6QbQrTNm8nVbKt+g4IV/VsnRJGbrSBdIUoydBDa6XcQMD/hfjTOMEHWybCM66LwtKbE6GcY3zjKUJzZHQbOGkDkh2211Oz7z9S+do+Pt8Dddb59PUy90sjcn3ZunW60t/2ZJNr6arksAET2i8eFmdjpSi21AtAaa5IXy7fRRKIxSlgMR0gat6DbsTTKc7mISeu+Yil6lJPxD7dj8AZ+ZLFTvcjYlPCpGtAIt5PyKRqiPhqHLFHEEDO6N7C5Sd34yNXrpBayJRVfDcgmF7HKTWcw1Wdy8mpv2hc7AFsOemOI5X9KFKPv0YBiyQw== morguecopy from ftpmaster
-

diff --git a/config/homedir/ssh/ftpmaster-config b/config/homedir/ssh/ftpmaster-config
index 7c7e7346fdb27e8052d1774f9994dd81dce5a9d2..045ae29a8bcf145063842be3a0b70f919565d684 100644 (file)
--- a/config/homedir/ssh/ftpmaster-config
+++ b/config/homedir/ssh/ftpmaster-config
@@ -1,53 +1,33 @@
 Protocol 2
 ConnectTimeout 30
 ServerAliveInterval 30
+ForwardX11 no
+ForwardAgent no
+StrictHostKeyChecking yes
+PasswordAuthentication no
+BatchMode yes
 
 Host bugs-sync
   Hostname bugs-master.debian.org
   User debbugs
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/id_debbugs-vt
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
 Host ddtp-sync
   Hostname i18n.debian.net
   User ddtp-dak
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/ddtp-dak.rsa
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
 Host morgue-sync
   Hostname stabile.debian.org
   User dak
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/push_morgue
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
 Host ries-sync
   Hostname ries.debian.org
   User dak
-  IdentityFile /home/dak/.ssh/id_franck
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/id_franck
 
 Host external-security
   Hostname chopin.debian.org
   User dak
-  IdentityFile /home/dak/.ssh/push_external_files
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_external_files