From: martin f. krafft Date: Sun, 15 Jun 2008 20:06:58 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/c16e02e0ef5b5183b2aa7dda044f9dd9c8b51399?hp=c4e61eb11bb81f09afcf752961bdfe1533fc21ed Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh --- diff --git a/.ssh/authorized_keys.d/madduck@lapse.madduck.net b/.ssh/authorized_keys.d/madduck@lapse.madduck.net deleted file mode 100644 index 4905b3f..0000000 --- a/.ssh/authorized_keys.d/madduck@lapse.madduck.net +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAyKoeEmPM+VGgciIarXb03hPTawJ6XrtaloFC88R5S2B/UB6dcSSEtFAenM+y+8P9fJcKq75a4223jcTsIcRAoGcPpJFPjOZ0Rzfs6CpLlNB/hlmkgBAjVpzFZZphBtB+g0bKSJ/bnZ75G/RnC07OeahrcXJrPsjgfdcIrtVGTqB0UFNPw6/d358doWEbE7jOic5mVH0KZvzRVKNa0ssnsDVxFYb5E5IaUg9Vw7SieeumcT2sob6AAt3XFNt8g6Ab42ibkzu1UeVLRkWivJby5WznYtTxSm3BrOq6zXsUJ1yZsldQTx31kZyZ82HRDh6s75JV1D2DG8X+3r7bfhBPSF/jYcl0S3zUTPX8ehPGWufjuTTHXMEi7Bd6B/Hg15l+8at8YNleWJ7DpHwNi6NRpFZGoQlSljuqi64ZMtasWN/X8ZQCVwv0Xp2I5Z6fhH13JD1mbNlAdt8JJpqd924FHRPOKJiVf7l3hN8LVZI+qh+kO0wJWpijZegW3j8rjuxxRj6OWn89dkn0zqbd1wJmsbNXlVW2hHa2A3qdteidhYzOPOEaZ5QuYw3PbfXdeqDKklqrmPwCc/ADQl1+yCmaXrG2EthgzC+DEhjcJiVXcZxjxOZ/kNuo+NKz86ioR6gC4a3aA3lK39+3H6HAXFGk+qTzlFrQjYYWk3OhBnPsBSU= madduck@lapse.madduck.net diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net index c559371..f329bc3 100644 --- a/.ssh/known_hosts.d/madduck.net +++ b/.ssh/known_hosts.d/madduck.net @@ -8,4 +8,4 @@ albatross.madduck.net,albatross,130.60.75.72 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQE # dynamic hosts embryo.madduck.net,embryo ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuW3v2Fzg6oc574yjV3YqhneS4G8Ov82KFWpSGwHOjxtO17eNr1Jkdtyd0y8lwaFoFmaRDb/V52Zu9m7YTQ2dUYHeTTOK6I0xQULYjmehWLkSNlyf+EIeHtjrnoC/ZkMpyBjg3I4ppvQyMS5rLKJZHnSC0kJG+iEELbLqtq9C8pqOCu0sY0uKXhI5Npa7hwk0yWxdQGPmvWhvP3ctGacyHb6onszVmZaC3Hb6KgWrMBPsDm8MHq7RXDR2P4LoRdTvE9Xs1X0ok1cagXi5isn2+42LlpH+97K4xmSoVWIQFHKbDIfDyLiCaQ5azzQLjLCdHsxAFJ0ClZGLBMdlHiXT0Q== wall.madduck.net,wall ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAn3XIlzSD+gDwYQYkNz4VJ5SeYK1rpLOirvSQv2kmPA7fKzxz7vl3nUZLT7RJ0ZxBzVs1WFBUw+Zm7l1x8Rg7/LiOn9PC/hy0phtp8wh4WRgi1hFOU/mTdEs7vz/9n6UbSoem8gbmVDpwv1M0BOjIVugqXPw5gu9ekSF04SYqei1Qz1Rk2fn6G9mm/kfk94q+GpxCHfhtBhzkvm3uGoRsgYH31LPErUZdRvvNmxaG4iiOFn4fJ11qjjarxOoSgD2UuJ4DNVcT+TtV1kFAK3xLosIwyIVsYiUtOh1922tyduTHW7WiYbO4suIBtJIMSRhZai3cZzK3eKsoF7IdssIbBw== -lapse.madduck.net,lapse ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvAzGLt//uljijSfgwWe0c2amHRGCiGXOHnm+MBzZpVwkc9wSI8WtLVvhQXIpX2DgzjZRRM9i2wONEX+SaiKz2GW7TNu2JNc3aBdUICVHnP2v1sN3MqAOXvjvpyWwqRMjt+qzU195LM2imC3LnSHVO4lCJTMKij5KOimmx/BLVj8piGWU3hbhyIGKsWhZpBI9I76uQKoSXmWZPnyJV6CODav8Coc7B1Gaz6L/diY/+PQ+XXgluH7/UOW8aS7CK2Gjgwg4qZi5TD45ZSxv/OlgpeT1FPLfks6RMuMhZNkTeLeuurtQo/4vHmls5HuVTGROvfBgFLnbHfejPpNMBphY3w== +lapse.madduck.net,lapse ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHV0A/dlI7LKkOWa2xaVyFohZ29la56hCP5qntqSem/o48EEeKTnIdJmBuHoE3jucoLvFvmw/HYafR2MZxbg/kIoYSYvYHHc2JQZT/i1cRvGgGH8BWgAHOuLxMoiKKA8bbuUy+95s2/BLwchxX6J9SUoQprWq/KcX69pO/8ohh+9WlB/FIwRv1nccyGVCbadfZ4Tdq1IcZ1rGqD2q2U8Zz2OwI/VDyR9q+oxSEKCcXxs2eidVLdQBYgIsqLRQulq7fvXDzXPsADYb9XlPPeavbWZxK5rxtMNXkVLk6Ztme4KOMAJDWQD6CuV+tGeDMcy0dIguKgUbozUKLYr+pJ5Qw==