M .bashrc => .bashrc +4 -3
@@ 9,12 9,13 @@ alias grep="grep --color=auto"
PS1="[\u@\h:\w]\$ "
-# Start GPG agent
-gpgconf --launch gpg-agent
+# Start GPG agent. Normally this is automatically started on demand but can be
+# started manually for SSH agent support.
+# gpg-connect-agent /bye
# Set SSH_AUTH_SOCK so that SSH will use gpg-agent instead of ssh-agent
unset SSH_AGENT_PID
-if [[ -z "$SSH_AUTH_SOCK" ]]; then
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
M gnupg/gpg.conf => gnupg/gpg.conf +1 -0
@@ 4,3 4,4 @@ with-fingerprint
no-comments
no-emit-version
default-key 0xECF139A777CA3454
+use-agent
M ssh/config => ssh/config +1 -1
@@ 3,7 3,7 @@
Match host * exec "gpg-connect-agent updatestartuptty /bye"
Host chabo
- Hostname 192.168.1.38
+ Hostname 192.168.1.98
Host heron
Hostname 192.168.1.64