From 2dfbdef85f31471a6957524d7bd0294834a40471 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 16 Mar 2026 17:25:44 +0300 Subject: [PATCH] feat(ssh): update SSH configuration and add new identity files --- ssh/.ssh/config.d/00-globals.conf | 2 ++ ssh/.ssh/config.d/10-local.conf | 5 ++--- ssh/.ssh/config.d/20-selfhost.conf | 8 ++++---- ssh/.ssh/config.d/30-corporate.conf | 4 ++-- ssh/.ssh/config.d/40-proxy.conf | 11 +---------- ssh/.ssh/keys/ada-pc.pub | 1 + ssh/.ssh/keys/adax1.pub | 1 + ssh/.ssh/keys/autossh-proxy.pub | 1 + ssh/.ssh/keys/fl-vpn.pub | 1 + ssh/.ssh/keys/homelab_ssh.pub | 1 + ssh/.ssh/keys/key_vps.pub | 1 + zsh/.config/zsh/config/env.zsh | 3 +++ 12 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 ssh/.ssh/keys/ada-pc.pub create mode 100644 ssh/.ssh/keys/adax1.pub create mode 100644 ssh/.ssh/keys/autossh-proxy.pub create mode 100644 ssh/.ssh/keys/fl-vpn.pub create mode 100644 ssh/.ssh/keys/homelab_ssh.pub create mode 100644 ssh/.ssh/keys/key_vps.pub diff --git a/ssh/.ssh/config.d/00-globals.conf b/ssh/.ssh/config.d/00-globals.conf index 9d0af37..b6f1145 100644 --- a/ssh/.ssh/config.d/00-globals.conf +++ b/ssh/.ssh/config.d/00-globals.conf @@ -12,6 +12,8 @@ Host * # Использовать только явно заданные ключи IdentitiesOnly yes + IdentityAgent ~/.bitwarden-ssh-agent.sock + # Таймауты подключения ConnectTimeout 10 ConnectionAttempts 2 diff --git a/ssh/.ssh/config.d/10-local.conf b/ssh/.ssh/config.d/10-local.conf index 4f5d4de..dd054b3 100644 --- a/ssh/.ssh/config.d/10-local.conf +++ b/ssh/.ssh/config.d/10-local.conf @@ -1,10 +1,9 @@ Host ada-pc HostName 192.168.1.100 User ada - IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/keys/ada-pc.pub Host ada-x1 HostName 192.168.1.101 User ada - IdentityFile ~/.ssh/id_ed25519 - + IdentityFile ~/.ssh/keys/adax1.pub diff --git a/ssh/.ssh/config.d/20-selfhost.conf b/ssh/.ssh/config.d/20-selfhost.conf index bb19783..d39f062 100644 --- a/ssh/.ssh/config.d/20-selfhost.conf +++ b/ssh/.ssh/config.d/20-selfhost.conf @@ -3,20 +3,20 @@ Host vps vps-ada HostName 157.22.231.198 Port 22 User ada - IdentityFile ~/.ssh/id_ed25519_homelab + IdentityFile ~/.ssh/keys/homelab_ssh.pub # ZimaOS Host casa casaos casa-vm HostName 100.87.138.76 User ada - IdentityFile ~/.ssh/id_ed25519_homelab + IdentityFile ~/.ssh/keys/homelab_ssh.pub SetEnv TERM=xterm-256color ProxyJump vps Host pve HostName 100.68.130.76 User root - IdentityFile ~/.ssh/id_ed25519_homelab + IdentityFile ~/.ssh/keys/homelab_ssh.pub SetEnv TERM=xterm-256color ProxyJump vps @@ -24,5 +24,5 @@ Host git.ada-dev.ru HostName 100.87.138.76 Port 222 User git - IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/keys/key_vps.pub ProxyJump vps diff --git a/ssh/.ssh/config.d/30-corporate.conf b/ssh/.ssh/config.d/30-corporate.conf index 3830945..3c1fd7e 100644 --- a/ssh/.ssh/config.d/30-corporate.conf +++ b/ssh/.ssh/config.d/30-corporate.conf @@ -1,9 +1,9 @@ Host devel.mephi.ru HostName devel.mephi.ru - IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/keys/ada-pc.pub KexAlgorithms +curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 Host github.com HostName github.com User git - IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/keys/ada-pc.pub diff --git a/ssh/.ssh/config.d/40-proxy.conf b/ssh/.ssh/config.d/40-proxy.conf index f350121..4215fcb 100644 --- a/ssh/.ssh/config.d/40-proxy.conf +++ b/ssh/.ssh/config.d/40-proxy.conf @@ -1,15 +1,6 @@ Host ru-vps HostName 157.22.231.198 User ada - IdentityFile ~/.ssh/id_ed25519_homelab - ServerAliveInterval 30 - ServerAliveCountMax 3 - -Host nl-vps - HostName 170.168.25.171 - User ada - IdentityFile ~/.ssh/id_ed25519 - ProxyJump ru-vps ServerAliveInterval 30 ServerAliveCountMax 3 @@ -17,7 +8,7 @@ Host fl-vps HostName 89.167.32.245 Port 4322 User ada - IdentityFile ~/.ssh/id_ed25519_flvpn + IdentityFile ~/.ssh/keys/fl-vpn.pub ProxyJump ru-vps ServerAliveInterval 30 ServerAliveCountMax 3 diff --git a/ssh/.ssh/keys/ada-pc.pub b/ssh/.ssh/keys/ada-pc.pub new file mode 100644 index 0000000..822f6db --- /dev/null +++ b/ssh/.ssh/keys/ada-pc.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH50axSCXZiDkpnbggASg1P+EfAKhdExahLOXKe0VxqS ada-pc diff --git a/ssh/.ssh/keys/adax1.pub b/ssh/.ssh/keys/adax1.pub new file mode 100644 index 0000000..2b06c9c --- /dev/null +++ b/ssh/.ssh/keys/adax1.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWNsUQmppB6cQccXX1ZaBbFIcmM6RmghsTVbG9TgoZB adax1 diff --git a/ssh/.ssh/keys/autossh-proxy.pub b/ssh/.ssh/keys/autossh-proxy.pub new file mode 100644 index 0000000..ce784a7 --- /dev/null +++ b/ssh/.ssh/keys/autossh-proxy.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMwZ10/S25oSZsJNdWWMwfelPDM4VcZMGHQ9PDxW1A1G autossh-proxy diff --git a/ssh/.ssh/keys/fl-vpn.pub b/ssh/.ssh/keys/fl-vpn.pub new file mode 100644 index 0000000..6d34b76 --- /dev/null +++ b/ssh/.ssh/keys/fl-vpn.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApx18Rmr32XqE+XnHl+sJkZGFWvyQ+uMGfOic2TdYju fl-vpn diff --git a/ssh/.ssh/keys/homelab_ssh.pub b/ssh/.ssh/keys/homelab_ssh.pub new file mode 100644 index 0000000..fa6c6cc --- /dev/null +++ b/ssh/.ssh/keys/homelab_ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICmj/O+dwIiuFW0VVYnbX/PUComP1h5VrCBoMTIP3j0Z homelab_ssh diff --git a/ssh/.ssh/keys/key_vps.pub b/ssh/.ssh/keys/key_vps.pub new file mode 100644 index 0000000..688f275 --- /dev/null +++ b/ssh/.ssh/keys/key_vps.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJoW3axMmMF1+sffBSKK/K388I1TdLqXcJbXlJd6/BI1 key_vps diff --git a/zsh/.config/zsh/config/env.zsh b/zsh/.config/zsh/config/env.zsh index 09ccb86..15bf61d 100644 --- a/zsh/.config/zsh/config/env.zsh +++ b/zsh/.config/zsh/config/env.zsh @@ -91,3 +91,6 @@ fi if command -v direnv >/dev/null 2>&1; then eval "$(direnv hook zsh)" fi + + +export SSH_AUTH_SOCK='/home/ada/.bitwarden-ssh-agent.sock'