encapsulate preauthtunnel in script

diff --git a/.gitignore.d/offlineimap b/.gitignore.d/offlineimap
index 7acdc907519e1d142f02354524d9a4808fc083a6..03dcd57f8f6231345d2c95e0e87e181e5500ff95 100644 (file)
--- a/.gitignore.d/offlineimap
+++ b/.gitignore.d/offlineimap
@@ -6,6 +6,7 @@
 !/.offlineimap/.gitignore
 !/.offlineimap/helper.py
 !/.offlineimap/known_hosts
+!/.offlineimap/preauthtunnel.sh
 !/.offlineimaprc
 !/.offlineimap/ssh_config
 !/.var/offlineimap/.gitignore

diff --git a/.offlineimap/preauthtunnel.sh b/.offlineimap/preauthtunnel.sh
new file mode 100755 (executable)
index 0000000..0976974
--- /dev/null
+++ b/.offlineimap/preauthtunnel.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec ssh -F ~/.offlineimap/ssh_config -i ~/.offlineimap/${1}.ssh-seckey ${1}

diff --git a/.offlineimaprc b/.offlineimaprc
index aa7267cd654d4f80ed2ace4326d5aa0bac4a90d3..bcc8bbc6fee8030594b9b98bbdddb568b8aecf4c 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -40,7 +40,7 @@ type = IMAP
 maxconnections = 5
 holdconnectionopen = yes
 ssh_host = madduck-net.imap.madduck.net
-preauthtunnel = ssh -F ~/.offlineimap/ssh_config -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s
+preauthtunnel = .offlineimap/preauthtunnel.sh %(ssh_host)s
 expunge = yes
 foldersort = py_foldersort_main
 nametrans = py_nametrans
@@ -51,7 +51,7 @@ type = IMAP
 maxconnections = 1
 holdconnectionopen = no
 ssh_host = madduck-net.imap.madduck.net
-preauthtunnel = ssh -F ~/.offlineimap/ssh_config -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s
+preauthtunnel = .offlineimap/preauthtunnel.sh %(ssh_host)s
 expunge = yes
 folderfilter = py_folderfilter_bulk
 foldersort = py_foldersort_main