update ssh pubkeys

diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh
index 452e3fbc0ff624803cda95b96343533fa08fcf66..bb4d90330bf9d9013382764b816a54925ae69f96 100644 (file)
--- a/.gitignore.d/ssh
+++ b/.gitignore.d/ssh
@@ -4,39 +4,34 @@
 !/.config/vcsh/hooks-available
 !/.config/vcsh/hooks-available/ssh.post-run+enter
 !/.config/vcsh/hooks-enabled
 !/.config/vcsh/hooks-available
 !/.config/vcsh/hooks-available/ssh.post-run+enter
 !/.config/vcsh/hooks-enabled

-!/.config/vcsh/hooks-enabled/ssh.post-enter
-!/.config/vcsh/hooks-enabled/ssh.post-run
+!/.config/vcsh/hooks-enabled/post-enter.ssh
+!/.config/vcsh/hooks-enabled/post-run.ssh
+!/.gitignore.d
+!/.gitignore.d/ssh

 !/.ssh
 !/.ssh/authorized_keys.d
 !/.ssh
 !/.ssh/authorized_keys.d

-!/.ssh/authorized_keys.d/galaxy-s2
-!/.ssh/authorized_keys.d/madduck@albatross.gern.madduck.net
-!/.ssh/authorized_keys.d/madduck@fishbowl.rw.madduck.net
+!/.ssh/authorized_keys.d/ed25519@albatross
+!/.ssh/authorized_keys.d/ed25519@fishbowl
+!/.ssh/authorized_keys.d/openpgp@smartcard

 !/.ssh/config.in
 !/.ssh/.gitignore
 !/.ssh/known_hosts.d
 !/.ssh/config.in
 !/.ssh/.gitignore
 !/.ssh/known_hosts.d

-!/.ssh/known_hosts.d/aika.krafftwerk.de

 !/.ssh/known_hosts.d/bazaar.launchpad.net
 !/.ssh/known_hosts.d/bazaar.launchpad.net

-!/.ssh/known_hosts.d/bytemark.co.uk

 !/.ssh/known_hosts.d/debconf.org
 !/.ssh/known_hosts.d/debian-community.org
 !/.ssh/known_hosts.d/debian.org
 !/.ssh/known_hosts.d/debconf.org
 !/.ssh/known_hosts.d/debian-community.org
 !/.ssh/known_hosts.d/debian.org

-!/.ssh/known_hosts.d/fortytwo.ch
-!/.ssh/known_hosts.d/galaxy-s2

 !/.ssh/known_hosts.d/gauting.madduck.net
 !/.ssh/known_hosts.d/gern.madduck.net
 !/.ssh/known_hosts.d/github.com
 !/.ssh/known_hosts.d/gauting.madduck.net
 !/.ssh/known_hosts.d/gern.madduck.net
 !/.ssh/known_hosts.d/github.com

-!/.ssh/known_hosts.d/gplhost.com
-!/.ssh/known_hosts.d/ifi.uzh.ch
-!/.ssh/known_hosts.d/lab.madduck.net

 !/.ssh/known_hosts.d/lehel.madduck.net
 !/.ssh/known_hosts.d/madduck.net
 !/.ssh/known_hosts.d/lehel.madduck.net
 !/.ssh/known_hosts.d/madduck.net

-!/.ssh/known_hosts.d/mdadm-lab.madduck.net

 !/.ssh/known_hosts.d/mjollnir.org
 !/.ssh/known_hosts.d/mjollnir.org

-!/.ssh/known_hosts.d/notmuchmail.org
-!/.ssh/known_hosts.d/repo.or.cz
+!/.ssh/known_hosts.d/mtfk.de
+!/.ssh/known_hosts.d/mtvic.madduck.net

 !/.ssh/known_hosts.d/sheep.umverkehr.ch
 !/.ssh/known_hosts.d/skynet.ie
 !/.ssh/known_hosts.d/sheep.umverkehr.ch
 !/.ssh/known_hosts.d/skynet.ie

-!/.ssh/known_hosts.d/workbuffer.org
+!/.ssh/known_hosts.d/tilde-club
+!/.ssh/known_hosts.d/viinet.de

 !/.ssh/Makefile
 !/.var
 !/.var/ssh
 !/.ssh/Makefile
 !/.var
 !/.var/ssh


@@ -46,4 +41,4 @@
 !/.zsh
 !/.zsh/zshrc
 !/.zsh/zshrc/parts.d
 !/.zsh
 !/.zsh/zshrc
 !/.zsh/zshrc/parts.d

-!/.zsh/zshrc/parts.d/50_ssh
+!/.zsh/zshrc/parts.d/50-ssh

diff --git a/.ssh/authorized_keys.d/ed25519@albatross b/.ssh/authorized_keys.d/ed25519@albatross
new file mode 100644 (file)
index 0000000..5240412
--- /dev/null
+++ b/.ssh/authorized_keys.d/ed25519@albatross
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVKR62XLahX+/RGLL9J7Ho+jq3NN3Szo5bXxIbDuduG madduck@albatross

diff --git a/.ssh/authorized_keys.d/ed25519@fishbowl b/.ssh/authorized_keys.d/ed25519@fishbowl
new file mode 100644 (file)
index 0000000..dc3a7ed
--- /dev/null
+++ b/.ssh/authorized_keys.d/ed25519@fishbowl
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUyt2rgldAH7ryG3Yi3kTu/6/gPTD57V2S73nC6NTkJ madduck@fishbowl

diff --git a/.ssh/authorized_keys.d/smartcard b/.ssh/authorized_keys.d/openpgp@smartcard
similarity index 100%
rename from .ssh/authorized_keys.d/smartcard
rename to .ssh/authorized_keys.d/openpgp@smartcard