Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh

diff --git a/.ssh/config.in b/.ssh/config.in
index 049362dfbb0fa8ecb2c8e4ec07c066f9565f355d..0925cb3922d72af55274c46998bc71b402cfb9ce 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -215,7 +215,7 @@ Host mother.gauting | mother | mother.gauting.madduck.net
   ForwardX11 yes
 Host mothere
   Hostname embryo.gauting.madduck.net
-  Port 22221
+  Port 22021
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -242,6 +242,9 @@ Host fishbowl
 
 ### DEBIAN
 
+Host scm.alioth.debian.org
+  HostKeyAlias wagner.debian.org
+  User madduck
 Host svn.debian.org
   HostKeyAlias vasks.debian.org
   User madduck

diff --git a/.ssh/known_hosts.d/bytemark.co.uk b/.ssh/known_hosts.d/bytemark.co.uk
index 88f58db85b76c3ef2ec847a16bb7cc8ae281de54..1e2adc66f162718d82bd67ce0f2c72faae8b97d8 100644 (file)
--- a/.ssh/known_hosts.d/bytemark.co.uk
+++ b/.ssh/known_hosts.d/bytemark.co.uk
@@ -1 +1,2 @@
-swan-host.madduck.net,swan-host,89.16.188.47 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArY/vzinYDtnqIV2lfx3AOvJJbV6K8taQPIVu7SlaKW7cvySeyqSsHZOWfJiOUrvokV0X7OveChXoo6+NTSeRviBAxGoMS+qfzzTQaQnDgKIaB5eKakiNGXWTH5u8NO7IMHaCZCAzaQvqUnlP4FUu4vt8JYiDHxe8QKfEeYAXX660O6u3WJW3vUxeHX7qIg4kaBOIS8FXrHc05hy4Lt99reOFAfJALZraXHxDCa/Cg7uNX5Rw6zCNGgK5J7fFaO5RXANzAydEwvweYJCytDsSlCNJUVESA5RlgK8VinVQqAtNg1QKrNrEWY0FKcuzZNFjD3AjHJeyI9BWtpgOh1Vpqw==
+swan-host.madduck.net,2001:41c8:0:858::30 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4kJYLUbb8N0UolOqV+I5KYd/nUm4ogUHGTaaS/aAjhXUpDH4EPZ3bdpkWqcor+0E6ixAXUjJpcByerYAB+4HDiyfYJqBU3n9dp4jPwYkwR53vNzlbjmF+9UPHAILJ6r+Ob/jszb3LdpH+q0nSkpKmWIgdaAQafYrP7hgRZV1o6AFIIzG2M43QsDMK4Xet6VHh9QM3r0XigtY4rc5GAv+QSF7spr62OValZo8E1dU95oAG0urfV0KX0Cjw+jvIDqKvN8o6NM1JWib1Tp3TkOIiGV2hsOqAVPYEmn7b0b7K27ieR1RIXc3heq4EnNby2tG6CAXZtatPU3K1g46gvMtvw==
+

diff --git a/.ssh/known_hosts.d/debian.org b/.ssh/known_hosts.d/debian.org
index 21d9599a967c09b7beac2539995e8f3b5ab9e8e1..7c634e8555ed326782a5f63f84e1c4d5293e41e8 100644 (file)
--- a/.ssh/known_hosts.d/debian.org
+++ b/.ssh/known_hosts.d/debian.org
@@ -165,7 +165,7 @@ tristano.debian.org,tristano,ganeti2.debian.org,ganeti2,206.12.19.213,2607:f8f0:
 tye.debian.org,tye,i18n.debian.org,i18n,206.12.19.129,2607:f8f0:610:4000:6564:a62:ce0c:1381 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgEkJYvdSgHE2Bn1g75+l9JyO1YVAJo8lVRm2HoFMi/zdjlPonPwpzkgl3QjUE2lVXiM0k68L2gIC7gN9ZgX5shw8VI1Ww/WIAyIU9EVwr+BjQVWgNJy1pe46wZsmdNzU6edP2yHtZMBa9DEvmx4kecedI7OJxkuIrV3uCbPp0tts/u/oESnNMlzG1Ujrf0sVZcqNQp4C5WJdfQ4pcCvhvhYKy34FibASNpSDRUowvDJRdyrJEIFIxqUAtlN7J3DIUGgZ0kypM4eYT0AXcF0x7eG+eIKzG7cqhAPN07nFxWpHTyc5XvjU/17Fdr8u1Domcz2Si5WSsVsc0WAD72duR root@tye
 ullmann.debian.org,ullmann,206.12.19.141,2607:f8f0:610:4000:6564:a62:ce0c:138d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGDszrIZGuFXX8+z+rt/p7U7JfwUT2WaLZ1mhUTYWXndooNWKC0H4OH1rHBkETRe8J/7zbBUW373PwHGnbg5rQ0GSPqnOe+ksSgdY724DkJgubW57DSLMGdhr/qxqVzsC9yUIKwfYi5BDOvA5PQ/tgqiG9+hw1myNX9VOdW+zNfyjuuGn3XFm8zkv9uDnXunTs9Wt+tp7MdhmbeWDGNKZm3CspTiCXoxaF+jno7eRacoZKFpjswh5ig82N6KZjTq5H8E9T4FRfXLLeS5BQVas4JUlwaf5i5nJJC3KYJ7+pfKzvXZpweMSQIRCEMMO3RU98gXWj+itiX6odJZz6AXXv root@ullmann
 unger.debian.org,unger,82.195.75.102,2001:41b8:202:deb:222:64ff:fe08:fe6 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnfEpRMIi3hJheetPk38/f0YxpYYERLFQ8f854rpK/xj/Q890NGqHXdCQAqnv+l8IiDlXqqEhegkxRRMDZBsk1RMYSHXjyoWLNtdwWWamvtXzPQ+SkfO7adHebGu2pr2aRikq8RY4i9tHeRB/y04v7kAa9Fz5Y29bZMYndJH0N8IjiVrpF/tmaJvJboqhky6HkatT6GDcVU4z+MjXL7gWaD2GTb883vmWxQWDRHABUC9g4+7r/FffnZNsv3+ABmDkC+U9g1850CgQLxbD+oBGaEi7gsSwYmya2cPkDsvtjbwyzIaRKD/PYuT29k2vxLh4xnyAR/FvOAMBNEXbrp7fuw== root@unger
-vasks.debian.org,vasks,vasks.debian.org,vasks,git.debian.org,git,svn.debian.org,svn,bzr.debian.org,bzr,hg.debian.org,hg,arch.debian.org,arch,darcs.debian.org,darcs,cvs.debian.org,cvs,217.196.43.140 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF8qn48rsyjUYFKxxtJO6zm2Py2DbaybGhxHtJKOGZaXr2R/i+NoMJ2REOl6W/vfC6a8jQvgbzlYShhyHakBQgGSSqIYamuAuy6vMI5ofcCWz5zlzOUTfqYz8lWqWb7ThLTZQjCBI63pv36mH1lPMzU1YRqzBEzwHD00QvR7lJvJC+8CIGVYHp6/REi4NvQd8uZ5G8nR+Rzioi4uE6xVAzLUM0Hwstfa8obgZ8nMcHBPhBra4Lrl7rwbUhT2ziaKrdQkB9taQaxsIIM8d0Ic7loqwQGKP5fPug523Io9bOUekZE/jDLhQ72/NdP3UD9+bBcA12oQZDVkW4zDQguEwP root@vasks
+vasks.debian.org,vasks,vasks.debian.org,vasks,git.debian.org,git,svn.debian.org,svn,bzr.debian.org,bzr,hg.debian.org,hg,arch.debian.org,arch,darcs.debian.org,darcs,cvs.debian.org,cvs,5.153.231.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzHN3B7CPXopYu0uswB5NKyro/I88Sgdui4UC80+x6FniylXtRDWSf+psaMAdgqrKHyV/TSWwcgc+Vrh+Us07wBwdOhHUBiPrEh/04KSbijguZHiQeQQWDD0xC+zOJ9Woa6WH+WZARE5aWd3YEupaII7VRG6e3sxUHmMpTMgc19/voPNUqNzrdqKQNKKc1JGKxM4B/7JRmVNHeclNRyXPJKSUSMpe4+g9ldMssKiY8foFFPFA8gQ3oIjIAr/pALm2q4JLpsVoJy/JonkgkjO8iRfklqyTVLrXTaBc0isrVR4pGZ1QFbucJ5LO5rdxPwc1rxcBxK9clhsuUaLz8fv5n root@vasks
 vento.debian.org,vento,vote.debian.org,vote,82.195.75.98,2001:41b8:202:deb:216:36ff:fe40:4005 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtPZy4GdCh5mi1JQl6FpxvfstwgkvW1MbqPIjakgGiEcQaCJUh/z65nF0AYr+n5NAWkL/x5mmKSt9a8BSqxUIXMsGz9uFrI6ohEFoKVl1RkAK8nzCvgLLKMfQFudbGPZSdTZWD9HLCcu32Z4oHbZUjAeSPTdLdeZliVR6uxx4DilUUUVGo17fRy5XOHD2N2lW8bA4R0WJCqUl7Q+2vuCUyJxaTCD4ij745JxwY/wQH0CBbIOXTnjmE+5BwQuzn0H9vGN2BNupZ7YHRhejMvped+zEpjCZV/yIlnoqIi8YEl0QnHqcNl0/cdFJRnFIkp81rznZP4gsiGp3jpuENCQPV root@vento
 vieuxtemps.debian.org,vieuxtemps,packages.debian.org,packages,82.195.75.113 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjV8QT2JYtJlGgJLWT0eFWNimUvVqHwFwAhU9g7IgZMpEBsf9F8NED8hzm0Yp5d+boTaFQ3M/THeR4iZ4aou8/Wf0VQmThG6EN5AjimJawzUuOkNaNm9ctVRrXX1jTJdyyuvL8EJk2fajy9CuI/q9i7x96t1zHEPPTHYG3YInZgcdTOafQ/iUsVN4bgmTLHmFzpEjr3WUe0/HRYncqQPf7hCnODKq95+Rk3OgkCfHDkBu+XRSue99O/FtpyQtnod1xxBuTdLAWXeapX4sXI/AYh79V9t9AMY4rFzIUcvkXac2Ln1mT7NueMLOyazkZdZxg2L2nZAxwrX1S6G0nXOA3 root@vieuxtemps
 villa.debian.org,villa,2001:a78:5:0:216:35ff:fe7f:be4f,212.211.132.32 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAy1I/oGQTAgS1SXpsCPcH+0/lyPo9eO7LhkOTXi9+i8MjEvzstr12YILsS894CF0fZA44uctfeQaGIH8DvXieZfxZKV8FfYj/6yKadT8FCh5CQfMxuejPIqUr9zoXwagsG07I76ky2qEggktp1hNpF8AKBS6FqR0I50OgQ7C48t0= root@villa