From: martin f. krafft Date: Mon, 17 Feb 2014 20:33:45 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/4a00cd9a85291b97ba4e5ddf985a9904efdf5546?hp=e71feaf6c459d16177183b34930e923ad349b796 Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh --- diff --git a/.ssh/config.in b/.ssh/config.in index eda5d9c..0925cb3 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -134,7 +134,7 @@ Host swan.madduck.net | swan Hostname swan.madduck.net ### ARNOLD / GPLHOST -# + Host arnold-host | arnold-host.madduck.net Hostname arnold-host.madduck.net User xen05 @@ -157,17 +157,10 @@ Host juliae ForwardX11 yes HostKeyAlias julia.gern.madduck.net -Host albatross.lehel.madduck.net | albatross - Hostname albatross.lehel.madduck.net - ForwardAgent yes - ForwardX11 yes -Host albatrosse - Hostname wall.gern.madduck.net - Port 22032 - CheckHostIP no +Host fishbowl.gern.madduck.net | fishbowl.gern ForwardAgent yes ForwardX11 yes - HostKeyAlias albatross.lehel.madduck.net + HostKeyAlias fishbowl.gern Host galaxy-s2.phones.gern | galaxy-s2 Hostname galaxy-s2.phones.gern @@ -190,6 +183,24 @@ Host clegg.lehel.madduck.net | clegg ForwardAgent yes Hostname clegg.lehel.madduck.net +Host albatross.lehel.madduck.net | albatross.lehel | albatross + Hostname albatross.lehel.madduck.net + ForwardAgent yes + ForwardX11 yes + HostKeyAlias albatross.lehel +Host albatrosse + Hostname wall.lehel.madduck.net + Port 22032 + CheckHostIP no + ForwardAgent yes + ForwardX11 yes + HostKeyAlias albatross.lehel + +Host fishbowl.lehel.madduck.net | fishbowl.lehel + ForwardAgent yes + ForwardX11 yes + HostKeyAlias fishbowl.lehel + ### GAUTING Host embryo.gauting.madduck.net | embryo @@ -224,12 +235,7 @@ Host bricke ### ROAD WARRIORS -Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse - CheckHostIP no - ForwardAgent yes - ForwardX11 yes - -Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl +Host fishbowl CheckHostIP no ForwardAgent yes ForwardX11 yes diff --git a/.ssh/known_hosts.d/galaxy-s2 b/.ssh/known_hosts.d/galaxy-s2 index 8bfe9a5..c9688b5 100644 --- a/.ssh/known_hosts.d/galaxy-s2 +++ b/.ssh/known_hosts.d/galaxy-s2 @@ -1 +1,2 @@ -galaxy-s2.phones.gern,galaxy-s2.phones,galaxy-s2,2001:a60:f0fb:0:646:65ff:fee5:9046,192.168.14.96 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCiUyfFCUa6ZvPnduQK1UDp68zf6Iv193te/K+uNdwdEwsGNCzKevaKzMaoxuBx/XY35i8d0N7qaUevJW33FOZM8S+eXlYZ0ymhb2orB2ffcSSrtWmnysNQI1EO8vRjtokb9Vnqh5+JzO45v56XKaiz21Ps8cTFfnPWUJo4fq4BTygN +galaxy-s2.phones.gern,galaxy-s2.phones,galaxy-s2,2001:a60:f0fb::646:65ff:fee5:9046,192.168.14.96 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCiUyfFCUa6ZvPnduQK1UDp68zf6Iv193te/K+uNdwdEwsGNCzKevaKzMaoxuBx/XY35i8d0N7qaUevJW33FOZM8S+eXlYZ0ymhb2orB2ffcSSrtWmnysNQI1EO8vRjtokb9Vnqh5+JzO45v56XKaiz21Ps8cTFfnPWUJo4fq4BTygN +galaxy-s2.phones.lehel,galaxy-s2.phones,galaxy-s2,2001:a60:f10a::646:65ff:fee5:9046,192.168.17.96 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCiUyfFCUa6ZvPnduQK1UDp68zf6Iv193te/K+uNdwdEwsGNCzKevaKzMaoxuBx/XY35i8d0N7qaUevJW33FOZM8S+eXlYZ0ymhb2orB2ffcSSrtWmnysNQI1EO8vRjtokb9Vnqh5+JzO45v56XKaiz21Ps8cTFfnPWUJo4fq4BTygN diff --git a/.ssh/known_hosts.d/gern.madduck.net b/.ssh/known_hosts.d/gern.madduck.net index 35cade9..a7b0a70 100644 --- a/.ssh/known_hosts.d/gern.madduck.net +++ b/.ssh/known_hosts.d/gern.madduck.net @@ -2,4 +2,5 @@ wall.gern.madduck.net,wall.gern,wall,192.168.14.1,2001:a60:f0fb::1 ssh-rsa AAAAB julia.gern.madduck.net,julia.gern,julia,192.168.14.2,2001:a60:f0fb::226:2dff:fe01:11a5 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA513iTel6XMM30yMtr9p49wJ4OZCA1DDZNWI8wS9M7P+0VAZLp9HaDusG/tW1vxIofmKeEcGWSHBtgEPx9zRwdwHy2btMBS60MEY6UVnA4J+sDdhdb7q2+G867ylKSzdSyQkxN/pyQvYdKlTCu+X0q20eU7UPnP+Lq343IyI5yV2NelFZr9OD07IDtsvTDlpx8qdAeYwYkJNZ0OhIduwxBPvQXd693Jp1jh4PODBiFW7zqpUtrdiQKzbGoDMvjtTPhF/0eigsqWTOlW9jPYrazgZFG8rCtR9qhtT5mEWsS9XEH8YMNsVEtmpiY9R7BoCDMgyYPtk0sEXIrrtYvcKyuw== pict.gern.madduck.net,pict.gern,pict,192.168.14.3,2001:a60:f0fb::e611:5bff:fefe:e79d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC35w9HI+7T/0MrLtUGK6XAeGWwaRJt8wfl3EKPicySmxrc8ENMPMeWmpWoicCkpqkF+F5qKDLvSpDiUXd1bHuKekbM13qS+OIzvJ143IN7RHA6Z4XaxXZQ7X7BThbGNHrVdYAoCVq2pQsicpmj2on5RRmGEuBb3lF2wnTR3Ag0FBz6Zey1H6MIrEcvmwnTdf8yIrJuilFUmfYymKXLGuDbxWhmypM/kM5QcnxtVcfLf0Cxumj8QjTczJEu+DAITeBb1mYeotUp+w5k7XCvRAJ5fMkSAVSlIcvHzpyZeyLPJzk8NEJj4uH0iPYAN3u/wLRUgK3vpxgyVwu5eQAkLngV demetrius.gern,demetrius,192.168.14.66,2001:a60:f0fb::211:6bff:fe35:a0b7 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNYNjKwYUJE2dHYRs/18bOXGYbDwv4yirSpWOVDNmcgAIiAs96syaQtZsx1XbV9uJ+R6m6K2T4tw71yxfuhrcj2cKsgIJVXrQfWajRol6M1wFVoksYiX7WnyOXqtp+orT080/MVnIhBWJH2kuFCabtYH6yGAv1Jggm1b3DK3q4V8T41TuInHAOp8VlfUCZKTmwHU4vIeptR6WcMGmZ5p8vyrISXs+y4qjwxlIp2x118ZRqKu6KBpt2Q7xvNINiLoy9Bet1IgF+qA51SZq57xUnLoQRHTUOJXXS0o0GdlknhdunpfQ5f5mPgQ1dk53dmCc3fyXuepcGsIdrCa+3EYA5 +fishbowl.gern,192.168.14.33,2001:a60:f0fb::224:d7ff:fe04:c82c ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw== atom.gern.madduck.net,atom.gern,atom,192.168.14.126,2001:a60:f0fb::ba27:ebff:fe5d:5c08 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN9nB0jngK+iy2zGxoM51qELW/cW7mUkbgrA5dRtL+T2yySV54ADwarK1wwqnY128vAhzQQuUljCs6ho3ga2IyGKAtD8D2e2I/1n5T0v0SwR8h4Py4R/fXBzraogmCjHSQXd6ZBpRivSCTA3u4xds7Slg0RmNVlo+NvuFm1pU36KCYhoW9faB+W4zZQMfSZgwuJVS5p4rR/Qx8AgBV3Y6pXCg93QJYstXiHUvvEnj8JDyNcIHtnrPaoc5pXnJCsKnZsmXOmXPQyd/EhABEo3SfzHZ4V+x2X3Z6FfsOztt/BFEYmASWBjn+TFuaQLVa9hrcZw5U25PN42he2ZinDi1f diff --git a/.ssh/known_hosts.d/lehel.madduck.net b/.ssh/known_hosts.d/lehel.madduck.net index 7fe3635..13e8e97 100644 --- a/.ssh/known_hosts.d/lehel.madduck.net +++ b/.ssh/known_hosts.d/lehel.madduck.net @@ -1,2 +1,3 @@ clegg.lehel.madduck.net,clegg.lehel,clegg,192.168.17.1,2001:a60:f10a::1 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3rqCQ/65ZlNkBz7sIXHqSgN3zqsjvdU+UVzCVSbicxfWbAln9FQQjer4cwSfQUh9qYQhkl3+N/jSS8LYJxXosDXQ/1/jfKl5zKi0slBmH7lzxc+y8G6CarSSsNtNOvuG3e4f37XTE++7+7SvIx4fgwJDAvNxvPtUNXj+71fIuCG1/YfLdWb0zagTo4ubuK09gfTPhbwlfSK4WZRZlgSpXtwGLtgC1f6Ed7dNTI33e+EKT2oPSqwTJIWtNfOW5dZ0Es4abOnhWOhfyqKD8nk5imQY7ZbYYdhO0FPK+5rHPSdlD8i/YZEWHGJn5Z2O0uiOm9n2X/THbET+6RjfIS1ef -albatross.lehel.madduck.net,albatross.lehel,albatross,192.168.17.32,2001:a60:f10a:0:22cf:30ff:fe2a:7c07 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZiK3hZecC0PrGj9skKTpESwtMZHMs03atHPmICuxzg8VFFKBBkLCKvFzXw936dmVItNcLATpgUM0+Mva5gwDTU/944ZOpFvzS7ELxOKXS9yPzA6ZOBrWupNoaB/pTTXzl7qR4gFCG1S7NVwmolyZg3eipmlUglwzQe56SezOgSYPoeEF1I5sKbw69k2ep10YgHfrRqwQrgzkrqXczKsDZV748Eg1aO14mN0jjWbpkDWEWNdwiAniTF3uiRnLtsJJ49D8l+jSr0IWbl7cNbxHLdI7Zb46EudV5tsMYEkKD26bjtTFot04CHcwTzKa465YGuXb4FZG5SDwuL/PeWanP +albatross.lehel,albatross,192.168.17.32,2001:a60:f10a:0:22cf:30ff:fe2a:7c07 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZiK3hZecC0PrGj9skKTpESwtMZHMs03atHPmICuxzg8VFFKBBkLCKvFzXw936dmVItNcLATpgUM0+Mva5gwDTU/944ZOpFvzS7ELxOKXS9yPzA6ZOBrWupNoaB/pTTXzl7qR4gFCG1S7NVwmolyZg3eipmlUglwzQe56SezOgSYPoeEF1I5sKbw69k2ep10YgHfrRqwQrgzkrqXczKsDZV748Eg1aO14mN0jjWbpkDWEWNdwiAniTF3uiRnLtsJJ49D8l+jSr0IWbl7cNbxHLdI7Zb46EudV5tsMYEkKD26bjtTFot04CHcwTzKa465YGuXb4FZG5SDwuL/PeWanP +fishbowl.lehel,192.168.17.33,2001:a60:f10a::224:d7ff:fe04:c82c ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw== diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net index feefe5e..e3bbce4 100644 --- a/.ssh/known_hosts.d/madduck.net +++ b/.ssh/known_hosts.d/madduck.net @@ -17,4 +17,4 @@ vizier.madduck.net,vizier,188.174.253.165,2001:a60:902f::188.174.253.165 ssh-rsa wots.madduck.net,wots,2001:1620:2018:1:5054:ff:fe17:23ad ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuMBnnmSi/VLxD6xRVJQjl80neXhVaw4JDngivDLK+IsO5S+z1q4p+6SeChvO6vF3FVYnB0pkaFuhYFSPMJpQ7xj2Ct8PuzvPJPIOZVBgs4Hs6wOTXoVXUIHUUQlmwWxlgkxNAVAZM9vAdAHIN7HTdBuqqZt66acqKECGME+CEgUOiZg1SwyMcrqKmPGX1sEbwuMVg4DA3tQdzuuEGEpI7zp1whgkM+Stns5WeRRu2ld1CzV+BLFu1J4H9/ViwW7og74heUCtWKaNcFoD+ppdwlL3Rto3crSiszNTZWX7lBC0pQfO6S0XknbyPIbxqpfT6AYDNIvOLLf0Z0zSo4irGw== # road warriors -fishbowl.rw.madduck.net,fishbowl ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw== +fishbowl ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAo1XZRqJLkvUVOUcI87YU1hNdCO9J5ByMqUuMg6HkmL+uNyfBKeGVKTdfimgWpUsO7U3CLgdINC9pmtjRqTmtH/fT/vFeAM7JtAjrD5RS7AvJW8uRYNZ53t45BgIf2b5l7fYhmd3R8EFpbmZwDijiTDyY640nGFvFTI2mXmADqaSB4t9T3MJxIOQ7WdfspuYk7vNgGQaphupelz4TZLf0wHVpu3fdow3o4CYPJu+D/33s5G4qypxk3+CC+e1ra1Z1E8K+OkZGl3EjvxLoaV8oNDUHD/d3OlF8L4FeztnUNi4jNPFeiCn7bxfz39wLcwQN+hGJuU0/1HvKi2kKNcbQEw==