diff --git a/remote-gpg b/remote-gpg index 3667567..3d5ffaa 100755 --- a/remote-gpg +++ b/remote-gpg @@ -1,38 +1,39 @@ #! /bin/bash # remote-gpg # original author: Dustin J. Mitchell # modified at https://www.isi.edu/~calvin/gpgagent.htm # NOTE: this requires OpenSSH 6.7 or later ! # For OpenSuSE Tumbleweed I had to install http://download.opensuse.org/repositories/home:/dubkat/openSUSE_42.1/x86_64/openssh-7.2p2-134.1.x86_64.rpm # (found at http://software.opensuse.org/package/openssh), and then follow https://www.gentoo.org/support/news-items/2015-08-13-openssh-weak-keys.html to re-enable DSA! set -e remote_user=pkgapplications -host=lxr.kde.org +host=capona.kde.org REMOTE_HOME=/home/pkgapplications +REMOTE_UID=1001 SYSTEMD_SOCKET=/var/run/user/1000/gnupg/S.gpg-agent.extra HOME_SOCKET=$HOME/S.gpg-agent.extra if [ -S $SYSTEMD_SOCKET ]; then EXTRASOCKET=$SYSTEMD_SOCKET elif [ -S $HOME_SOCKET ]; then EXTRASOCKET=$HOME_SOCKET else echo "No extra socket found" exit 1 fi # remove any existing agent socket (in theory `StreamLocalBindUnlink yes` # does this, but in practice, not so much) -ssh $remote_user@$host rm -f $REMOTE_HOME/.gnupg/S.gpg-agent -ssh -v -t -R $REMOTE_HOME/.gnupg/S.gpg-agent:$EXTRASOCKET \ +ssh $remote_user@$host rm -f /run/user/$REMOTE_UID/gnupg/S.gpg-agent +ssh -v -t -R /run/user/$REMOTE_UID/gnupg/S.gpg-agent:$EXTRASOCKET \ $remote_user@$host \ sh -c "echo; echo \"Perform remote GPG operations and hit enter\"; \ read; \ sleep 2; \ - rm -f $REMOTE_HOME/.gnupg/S.gpg-agent"; + rm -f /run/user/$REMOTE_UID/gnupg/S.gpg-agent";