From 24ac9700ea3c8b15df1340074dd4d1281f82e5a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:12:57 +0200 Subject: [PATCH] Fix gpg agent forwarding --- home/.ssh/config | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 47d3c6c0..8c1d2a7a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,19 +11,20 @@ host moria HostName korhonen.cc port 221 User balrog - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + StreamLocalBindUnlink yes + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host tirion HostName tirion.korhonen.cc port 22 User gandalf - # Forward GPG agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra - # Forward SSH agent - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/1000/gnupg/S.gpg-agent.ssh + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host forgejo HostName korhonen.cc @@ -55,7 +56,10 @@ host gondor port 22 User reekymarko StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra + # Forward GPG agent + StreamLocalBindUnlink yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra + RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh host anitta HostName 10.200.200.4