From: martin f. krafft <madduck@madduck.net>
Date: Wed, 14 May 2008 18:56:56 +0000 (+0100)
Subject: reenable pubkey auth
X-Git-Url: https://git.madduck.net/etc/offlineimap.git/commitdiff_plain/2a619eeebbbd412dd3c8d93043bb8faac03e62db?hp=fbe97bcf619cafd5b06170ec82708343243438b8

reenable pubkey auth
---

diff --git a/.offlineimap/.gitignore b/.offlineimap/.gitignore
new file mode 100644
index 0000000..78284fd
--- /dev/null
+++ b/.offlineimap/.gitignore
@@ -0,0 +1,2 @@
+id_rsa.imap@seamus
+id_rsa.imap@seamus.pub
diff --git a/.offlineimaprc b/.offlineimaprc
index 63191aa..bc83d04 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -37,9 +37,7 @@ ssl = no
 maxconnections = 1
 holdconnectionopen = yes
 remoteuser = madduck
-#preauthtunnel = ssh -CaxS none -o "KeepAlive = yes" -o "ProtocolKeepAlives = 10" -o "ConnectTimeout 20" -o "ControlMaster no" -i ~/.offlineimap/id_dsa.imap seamus.madduck.net 'MAIL=$HOME/.maildir/ /usr/lib/dovecot/imap'
-# while SSH key auth is disabled
-preauthtunnel = ssh -Cax -o "KeepAlive = yes" -o "ProtocolKeepAlives = 10" -o "ConnectTimeout 20" seamus.madduck.net 'MAIL=$HOME/.maildir/ /usr/lib/dovecot/imap'
+preauthtunnel = SSH_AUTH_SOCK= ssh -CaxS none -o "ProtocolKeepAlives = 10" -o "ConnectTimeout 20" -o "ControlMaster no" -i ~/.offlineimap/id_rsa.imap@seamus seamus.madduck.net
 expunge = yes
 foldersort = py_foldersort_seamus
 nametrans = py_nametrans_seamus