Update ssh_config

private_dot_ssh/private_config

@@ -1,156 +1,10 @@
-Host finn
-    User ansible
-    HostName finn.strobeto.de
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host xj2jx027@xj2jx027.repo.borgbase.com
-    IdentitiesOnly yes
-    IdentityFile ~/.ssh/id_ed25519
-
-Host maxh
-  HostName 192.168.178.47
-  #HostName helios64
-  User root
-  IdentityFile ~/max-publickey
-  UserKnownHostsFile /dev/null
-Host max-unlock
-  HostName 192.168.178.47
-  User root
-  IdentityFile ~/max-publickey
-  UserKnownHostsFile /dev/null
-  Ciphers aes256-ctr
-  MACs hmac-sha2-256
-  HostKeyAlgorithms ecdsa-sha2-nistp256
-
-
-# Server
-Host aech aech.strobeto.de
-  #HostName 185.244.194.96
-  HostName aech.strobeto.de
-  #User art3m1s
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  RemoteCommand TERM=xterm-256color $SHELL
-  RequestTTY yes
-Host aech-unlock
-  HostName 185.244.194.96
-  #HostName aech.strobeto.de
-  Port 2222
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
-  Ciphers aes256-ctr
-  MACs hmac-sha2-256
-  HostKeyAlgorithms ssh-rsa
-
-Host oscar oscar.strobeto.de
-  #HostName 176.96.139.165
-  HostName oscar.strobeto.de
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  StrictHostKeyChecking no
-  VerifyHostKeyDNS no
-Host oscar-unlock
-  HostName 176.96.139.165
-  #HostName oscar.strobeto.de
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
-  Ciphers aes256-ctr
-  MACs hmac-sha2-256
-
-Host code.strobeto.de
-  HostName code.strobeto.de
-  User git
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-
-# HomeNet
-Host gate
-  #HostName 192.168.120.1
-  HostName gate.home.strobel.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host pi
-  #HostName 192.168.30.30
-  HostName pi.home.strobel.one
-  #User dietpi
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host s storage
-  #HostName 192.168.130.10
-  HostName storage.home.strobel.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host helios
-  HostName 192.168.178.20
-  #HostName helios.home.strobel.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host helios-unlock
-  HostName 192.168.178.20
-  #HostName helios.home.strobel.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
-  Ciphers aes256-ctr
-  MACs hmac-sha2-256
-  HostKeyAlgorithms ecdsa-sha2-nistp256
-
-Host owrt
-  HostName 192.168.1.1
-  Port 22
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-#  PasswordAuthentication yes
-  Ciphers aes256-ctr
-  MACs hmac-sha2-256
-  HostKeyAlgorithms ssh-rsa
-  UserKnownHostsFile /dev/null
-
-# Offsite Backup
-Host rnet
-  #HostName 82.197.184.220
-  HostName ch-s012.rsync.net
-  User 14119
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host bbaech
-  HostName ks5y910n.repo.borgbase.com
-  User ks5y910n
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host bbarchaide
-  HostName xj2jx027.repo.borgbase.com
-  User xj2jx027
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-
-# Git services
-Host github.com
-  User git
-  ControlMaster no
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-  MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
-
-# Friends
-Host max
-  HostName multimax.haedicke.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host torsten
-  HostName zero.roost.one
-  User root
-  IdentityFile ~/.ssh/id_rsa_yubikey.pub
-Host raphael
-  HostName saphie.de
-  User root
-  Port 9001
-  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
-
 Host *
   ControlMaster auto
   ControlPersist 300
   ControlPath ~/.ssh/socket-%r@%h:%p
   IdentitiesOnly yes
   HashKnownHosts yes
-#  PasswordAuthentication no
+  PasswordAuthentication no
   ChallengeResponseAuthentication no
   StrictHostKeyChecking ask
   VerifyHostKeyDNS yes
@@ -163,3 +17,114 @@ Host *
   KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256
   MACs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-128-etm@openssh.com
   HostKeyAlgorithms ssh-ed25519,ssh-ed25519-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,rsa-sha2-256,rsa-sha2-256-cert-v01@openssh.com,rsa-sha2-512,rsa-sha2-512-cert-v01@openssh.com
+
+## Server
+Host finn
+  User ansible
+  HostName finn.strobeto.de
+  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  # FIDO2
+  IdentityFile ~/.ssh/id_ed25519_sk_yk5nano
+Host finn-unlock
+  User root
+  HostName finn.strobeto.de
+  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  # FIDO2
+  IdentityFile ~/.ssh/id_ed25519_sk_yk5nano
+  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
+Host oscar oscar.strobeto.de
+  HostName oscar.strobeto.de
+  User root
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+Host oscar-unlock
+  HostName oscar.strobeto.de
+  User root
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
+  Ciphers aes256-ctr
+  MACs hmac-sha2-256
+Host code.strobeto.de
+  HostName code.strobeto.de
+  User git
+  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  # FIDO2
+  IdentityFile ~/.ssh/id_ed25519_sk_yk5nano
+
+## HomeNet
+Host helios
+  #HostName 192.168.178.20
+  HostName space.home.strobel.one
+  User anorak
+  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  # FIDO2
+  IdentityFile ~/.ssh/id_ed25519_sk_yk5nano
+Host helios-unlock
+  #HostName 192.168.178.20
+  HostName space.home.strobel.one
+  User root
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  UserKnownHostsFile ~/.ssh/known_hosts.initramfs
+  Ciphers aes256-ctr
+  MACs hmac-sha2-256
+  #HostKeyAlgorithms ssh-rsa
+
+## OpenWRT Router
+#Host owrt
+#  HostName 192.168.1.1
+#  Port 22
+#  User root
+#  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+#  Ciphers aes256-ctr
+#  MACs hmac-sha2-256
+#  HostKeyAlgorithms ssh-rsa
+#  UserKnownHostsFile /dev/null
+
+## Offsite Backup
+Host xj2jx027@xj2jx027.repo.borgbase.com
+  IdentityFile ~/.ssh/id_ed25519
+Host bbaech
+  HostName ks5y910n.repo.borgbase.com
+  User ks5y910n
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+Host bbarchaide
+  HostName xj2jx027.repo.borgbase.com
+  User xj2jx027
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+
+## Git services
+Host github.com
+  User git
+  ControlMaster no
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  #MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
+
+## Friends
+Host max
+  HostName multimax.haedicke.one
+  User root
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+Host maxh
+  HostName 192.168.178.47
+  #HostName helios64
+  User root
+  IdentityFile ~/max-publickey
+  UserKnownHostsFile /dev/null
+Host maxh-unlock
+  HostName 192.168.178.47
+  User root
+  IdentityFile ~/max-publickey
+  UserKnownHostsFile /dev/null
+  Ciphers aes256-ctr
+  MACs hmac-sha2-256
+  HostKeyAlgorithms ssh-rsa
+Host torsten
+  HostName zero.roost.one
+  User root
+  IdentityFile ~/.ssh/id_rsa_yubikey.pub
+Host raphael
+  HostName saphie.de
+  User root
+  Port 9001
+  #IdentityFile ~/.ssh/id_rsa_yubikey.pub
+  PasswordAuthentication yes
+