clean up and remove swan

diff --git a/.ssh/config.in b/.ssh/config.in
index c237b892d5f2f20cbd5960568aca8995c0ef9bac..80f2d857f97b75b74d7232feeba1de92f62df851 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -125,14 +125,7 @@ Host franz.ifi.uzh.ch | franz
   Hostname franz.ifi.uzh.ch
   User krafft
 
-### SWAN / BYTEMARK
-
-Host swan-host | swan-host.madduck.net
-  Hostname swan-host.madduck.net
-  User krafft
-
-Host swan.madduck.net | swan
-  Hostname swan.madduck.net
+### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
   Hostname piper.madduck.net
@@ -159,6 +152,7 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
+  ForwardX11 yes
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes

diff --git a/.ssh/known_hosts.d/bytemark.co.uk b/.ssh/known_hosts.d/bytemark.co.uk
deleted file mode 100644 (file)
index d42c99e..0000000
--- a/.ssh/known_hosts.d/bytemark.co.uk
+++ /dev/null
@@ -1 +0,0 @@
-swan-host.madduck.net,2001:41c9:0:1023::149,5.153.226.137 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC19JbTlDLf92tjwtSCPDwHTm3moZO3EHBmjVOTenoAKob7yDRv3TVTAGhb0JzRi0aaxEy3A90BpwDwtlA6J6Dnc/EQJDfUtKGxPqVL49qd5AtgQf31itsQ6/y0mmWuHHxj0nR8NAgNuXyVMnplLLxBizcuxVps3C16PkiXkawuXLPaQcw84azhv2jyF5IplPWguumjEl76mY0Xv+WytP+z27bMVRj84cUh+OnDrMnF5swDjLOY7dqfFK3rvPv+kksV38blxoasDah25ANxg2XhLFQkHfOXMcMmc+OHlwOP/Oqq+wQC1dwuPIBind8QpEKX0F2ihvmMapgODORmVE8l

diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net
index dcc04d1609a7200d9e221c91fba12e9e1f101c85..a3a3165a5f6ba990e8e4acb23b8ea1662ce4b5d0 100644 (file)
--- a/.ssh/known_hosts.d/madduck.net
+++ b/.ssh/known_hosts.d/madduck.net
@@ -1,7 +1,6 @@
 khyber.madduck.net,khyber,77.109.139.83,2001:1620:2018:2::77.109.139.83,2001:1620:2018:2::4d6d:8b53 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1YlHlkverQfqREtbhC/i4YNaQbiqvAIIBOv7G0GSlJJEMUwn0Qt0aEUqB3gGQtK4WGivOpzgHnGRcvsLFa8/lElr4OXwf8rbNSROYjz+gvITwht+o8nawaeXZJ+54qYlUkkE0qJ5mQkqcApAI/c1Cw64YT0LwDnppiVPP0CldatbA1a+8TzJFtBmX4QlyCki7QXaAp+a/EvugEpJR9qz3BYAZrF6SfBtbUTyUlehSA6XYt6AguAw+tulZPYpFyqx4wtCTry1RNOPz+x89yvC7OMVRqJWzdjaWMyFrOBAgxOi50zZ5FbLKwF6Kc7jRw8bcLPmL3ZnXdI+6C6TTiidhw==
 lotus.madduck.net,lotus,77.109.139.85,2001:1620:2018:2::77.109.139.85,2001:1620:2018:2::4d6d:8b55 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuMBnnmSi/VLxD6xRVJQjl80neXhVaw4JDngivDLK+IsO5S+z1q4p+6SeChvO6vF3FVYnB0pkaFuhYFSPMJpQ7xj2Ct8PuzvPJPIOZVBgs4Hs6wOTXoVXUIHUUQlmwWxlgkxNAVAZM9vAdAHIN7HTdBuqqZt66acqKECGME+CEgUOiZg1SwyMcrqKmPGX1sEbwuMVg4DA3tQdzuuEGEpI7zp1whgkM+Stns5WeRRu2ld1CzV+BLFu1J4H9/ViwW7og74heUCtWKaNcFoD+ppdwlL3Rto3crSiszNTZWX7lBC0pQfO6S0XknbyPIbxqpfT6AYDNIvOLLf0Z0zSo4irGw==
 jugband.madduck.net,jugband,77.109.139.86,2001:1620:2018:2::77.109.139.86,2001:1620:2018:2::4d6d:8b56 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuMBnnmSi/VLxD6xRVJQjl80neXhVaw4JDngivDLK+IsO5S+z1q4p+6SeChvO6vF3FVYnB0pkaFuhYFSPMJpQ7xj2Ct8PuzvPJPIOZVBgs4Hs6wOTXoVXUIHUUQlmwWxlgkxNAVAZM9vAdAHIN7HTdBuqqZt66acqKECGME+CEgUOiZg1SwyMcrqKmPGX1sEbwuMVg4DA3tQdzuuEGEpI7zp1whgkM+Stns5WeRRu2ld1CzV+BLFu1J4H9/ViwW7og74heUCtWKaNcFoD+ppdwlL3Rto3crSiszNTZWX7lBC0pQfO6S0XknbyPIbxqpfT6AYDNIvOLLf0Z0zSo4irGw==
-swan.madduck.net,swan,80.68.90.58,2001:41c8:1:5cf0::2 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA7hG2Slhv7q8Ym3po0sT+pH2Ln9+RgLos4FYh60OhMQQC5s8NzjDYQ1dGklbxs8iChA7IGfhyvUQqmVrz19pG65aq3hDhQc0xt9QqRpu58jqUNW/3pPCOYvZpe2BuQc0SkZr/MS6HTrIlRnlWVWGnd6MaDZQHAKyQ9Hn4QYEKNFPRg44PZ+l/MlZJhJOfPL0MKBkCy9bbCx+ivdj0L6+EdyRmRXkdPOJC28/ntnrFF0BUqHDMxvo/LZW/zWFAOO4kCTQQfHULqh+UCbKM5STXhUqrO/KlnmEgebdLxUHmHQH05cwf5RQd9S437wL/0qwKfHuNcqE48FjnhnDrMooUaQ==
 domine.madduck.net,domine,77.109.139.90,2001:1620:2018:2::77.109.139.90,2001:1620:2018:2::4d6d:8b5a ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzP2VFyw85oofmB44BTSZJa+fQkXw+/GaO1M4mzrCwyEONJsFEcG/O8UfhieCxJFUzLMYfKm3Bjv50ssLwCurK0/EIJaLImtIuVCkG6nLkk0wHYMVUlkQFo8sjnCdye1Fvr5RY54HmA4XZ6VpQgXjU1FDooPZfmDLKKH9r1uF7JY87Rw7cCf72utOFxI2tSanTaTY/Klbs0lF/OlAp3uut9Cg6g40j4MVjA/Ek60RCNiRIm6mcN1lJDVzXCCuyr7N6ajrwRMbUvt2j75nNlu0j2fzG6yjG1JCfNGfxfzoxB4cbtRvNOVIdBCEKuQoh97W1tAnFCvB59cRZwztfUj2Nw==
 diamond.madduck.net,diamond,130.60.75.54,2001:470:b46d::1 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNTaNwCdXSNbykPfQpzFoTeXFPlT1Gv/FH7RLvX+xqPb8BwXip3Y1h7xzfSX4ufRBRE7BLGlETqwxS7blzYeVFBDeZ5vQZ64SEI+Ra5BztpqFwbZwMItagnY7onHR9QAOBJkw4VsNGQcKQ2jC+wuTWySiVgu5QKwW9LbPkqMNb2o3QfC6/bTWxV1lJVc+Niy8JfD1pj8rN3AP0jyQY85RD02aq/nMukf8I+3sV0Sqqqvo5SESvJvYknepEFUqZvrrlc4y7sSscz2WZaUptlX9N508RFBZLzYQz77xwDFfZHShlxkJzcneVEVy4Y4jCEtyDgFhwgWgBLodHv0LNNMDz
 shelter.madduck.net,shelter,130.60.75.55,2001:470:b47c::1 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNHU0uDPkPnA5pKETApLVcuc/ROV/HVl+ntRyxsTgJc1YPLUEGWSWIJZelot0uwmeKg06Dae7xQb7wSXw/WV+2KEoYmYGs4unJNo7kCCsxiri5X+aWOiBhAa/7E0QSXZPRK5qEIsnPvZOGmNMFnxT0Dy3ZQ29568cedij1WqOVS/OCvRezk6Oi5BsVvzg1zjX9fMc9CkyGZzoxc2ct5O6SgHbRtEm4UE/ed6NYIbKLAeb4msYsQ4fdelwY5SVXyDbD+O9ciFsHFo+qRzpqDIvE1F8itgFt8OQoHgXWFVYBtzXP2LzlaRkMDuAfScnOIk4VDaCozJTyH3Qw8PBKZnHL