]> git.madduck.net Git - etc/offlineimap.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / offlineimap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: a432b36)
rename ssh key file to include host and not algo
authormartin f. krafft <madduck@madduck.net>
Thu, 31 Oct 2019 07:46:26 +0000 (20:46 +1300)
committermartin f. krafft <madduck@madduck.net>
Thu, 31 Oct 2019 07:46:26 +0000 (20:46 +1300)
.offlineimap/.gitignore patch | blob | history
.offlineimaprc patch | blob | history

diff --git a/.offlineimap/.gitignore b/.offlineimap/.gitignore
index 4cd5de2bfc5b6176aaa01ebf68be5263bd6efa08..89b532258fbbac99b86dee894fcfd28429446859 100644 (file)
--- a/.offlineimap/.gitignore
+++ b/.offlineimap/.gitignore
@@ -1,3 +1,2 @@
-id_rsa.imap@seamus
-id_rsa.imap@seamus.pub
+*.ssh-???key
 helper.pyc
 helper.pyc
diff --git a/.offlineimaprc b/.offlineimaprc
index 98d328f79c98b9e02330dc53855e3ce35dc600a1..dfe3212891b9c0b0eff21c71c0c74c000469fbc2 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -39,7 +39,8 @@ sep = /
 type = IMAP
 maxconnections = 5
 holdconnectionopen = yes
 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
 expunge = yes
 foldersort = py_foldersort_main
 nametrans = py_nametrans
@@ -49,7 +50,8 @@ folderfilter = py_folderfilter_main
 type = IMAP
 maxconnections = 1
 holdconnectionopen = yes
 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
 expunge = yes
 folderfilter = py_folderfilter_bulk
 foldersort = py_foldersort_main
offlineimap configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.