From: martin f. krafft Date: Thu, 12 Dec 2019 09:23:52 +0000 (+0100) Subject: Move SSH config from command line to a file X-Git-Url: https://git.madduck.net/etc/offlineimap.git/commitdiff_plain/bd99029e60ea5b8f5d1092faddd23a7ee32209dc Move SSH config from command line to a file --- diff --git a/.gitignore.d/offlineimap b/.gitignore.d/offlineimap index 76a4e79..72fc236 100644 --- a/.gitignore.d/offlineimap +++ b/.gitignore.d/offlineimap @@ -7,4 +7,5 @@ !/.offlineimap/helper.py !/.offlineimap/known_hosts !/.offlineimaprc +!/.offlineimap/ssh_config !/.var/offlineimap/.gitignore diff --git a/.offlineimap/ssh_config b/.offlineimap/ssh_config new file mode 100644 index 0000000..8301f15 --- /dev/null +++ b/.offlineimap/ssh_config @@ -0,0 +1,15 @@ +Host madduck-net.imap.madduck.net + IdentityAgent none + ForwardAgent no + ForwardX11 no + + ConnectTimeout 60 + ProtocolKeepAlives 10 + RequestTTY no + Compression yes + + StrictHostKeyChecking yes + UserKnownHostsFile ~/.offlineimap/known_hosts + + ControlMaster auto + ControlPath ~/.var/offlineimap/ssh_ctl_sock diff --git a/.offlineimaprc b/.offlineimaprc index dfe3212..85f642c 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -40,7 +40,7 @@ type = IMAP maxconnections = 5 holdconnectionopen = yes ssh_host = madduck-net.imap.madduck.net -preauthtunnel = SSH_AUTH_SOCK= ssh -TCaxS ~/.var/offlineimap/ssh_ctl_sock -o "ControlMaster auto" -o "ProtocolKeepAlives 10" -o "ConnectTimeout 60" -o "UserKnownHostsFile ~/.offlineimap/known_hosts" -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s +preauthtunnel = ssh -F ~/.offlineimap/ssh_config -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s expunge = yes foldersort = py_foldersort_main nametrans = py_nametrans @@ -51,7 +51,7 @@ type = IMAP maxconnections = 1 holdconnectionopen = yes ssh_host = madduck-net.imap.madduck.net -preauthtunnel = SSH_AUTH_SOCK= ssh -TCaxS ~/.var/offlineimap/ssh_ctl_sock_bulk -o "ControlMaster auto" -o "ProtocolKeepAlives 10" -o "ConnectTimeout 60" -o "UserKnownHostsFile ~/.offlineimap/known_hosts" -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s +preauthtunnel = ssh -F ~/.offlineimap/ssh_config -i ~/.offlineimap/%(ssh_host)s.ssh-seckey %(ssh_host)s expunge = yes folderfilter = py_folderfilter_bulk foldersort = py_foldersort_main