From 9f69969572ae55c78668df8b49be570ebc0d7aed Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 31 Oct 2019 20:46:26 +1300 Subject: [PATCH 1/1] rename ssh key file to include host and not algo --- .offlineimap/.gitignore | 3 +-- .offlineimaprc | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.offlineimap/.gitignore b/.offlineimap/.gitignore index 4cd5de2..89b5322 100644 --- a/.offlineimap/.gitignore +++ b/.offlineimap/.gitignore @@ -1,3 +1,2 @@ -id_rsa.imap@seamus -id_rsa.imap@seamus.pub +*.ssh-???key helper.pyc diff --git a/.offlineimaprc b/.offlineimaprc index 98d328f..dfe3212 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -39,7 +39,8 @@ sep = / type = IMAP maxconnections = 5 holdconnectionopen = yes -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/id_ecdsa madduck-net.imap.madduck.net +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 expunge = yes foldersort = py_foldersort_main nametrans = py_nametrans @@ -49,7 +50,8 @@ folderfilter = py_folderfilter_main type = IMAP maxconnections = 1 holdconnectionopen = yes -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/id_ecdsa madduck-net.imap.madduck.net +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 expunge = yes folderfilter = py_folderfilter_bulk foldersort = py_foldersort_main -- 2.39.5