X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=bsmtp-pull;h=5c95f92e4c067b2e1a149b2487f8b595c9494056;hp=5a2c474c6c68fc09bdf879bda76c08221888eae8;hb=bfecc0dc54e64c2735fcc8816c623b103565e83c;hpb=f65a1cbceaa3ab471e5d9fa87f5637559e3b581d

diff --git a/bsmtp-pull b/bsmtp-pull
index 5a2c474..5c95f92 100755
--- a/bsmtp-pull
+++ b/bsmtp-pull
@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-DIR="$HOME/.bsmtp"
+DIR="$HOME/tmp/.bsmtp"
 mkdir -p "$DIR"
 cd "$DIR"
 
@@ -23,7 +23,7 @@ lockfile-touch "$HOST" &
 TOUCH="$!"
 trap 'kill "$TOUCH"; lockfile-remove "$HOST"' EXIT ERR HUP INT QUIT TERM
 
-ssh -2 -C "$HOST" bsmtp-pull-server > "$HOST"
+ssh -2 -i "$HOME/.ssh/id-bsmtp-$HOST" -C "$HOST" bsmtp-pull-server > "$HOST"
 [ -s "$HOST" ] || exit 0
 /usr/sbin/sendmail -bS < "$HOST"
 rm -f "$HOST"