]> 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: 9f69969)
Move SSH config from command line to a file
authormartin f. krafft <madduck@madduck.net>
Thu, 12 Dec 2019 09:23:52 +0000 (10:23 +0100)
committermartin f. krafft <madduck@madduck.net>
Thu, 12 Dec 2019 09:23:52 +0000 (10:23 +0100)
.gitignore.d/offlineimap patch | blob | history
.offlineimap/ssh_config [new file with mode: 0644] patch | blob
.offlineimaprc patch | blob | history

diff --git a/.gitignore.d/offlineimap b/.gitignore.d/offlineimap
index 76a4e79c3a31681a80ae2b7e1064ee499aa32603..72fc2363fad2029b226ecac79913bb9ddfea697d 100644 (file)
--- a/.gitignore.d/offlineimap
+++ b/.gitignore.d/offlineimap
@@ -7,4 +7,5 @@
 !/.offlineimap/helper.py
 !/.offlineimap/known_hosts
 !/.offlineimaprc
 !/.offlineimap/helper.py
 !/.offlineimap/known_hosts
 !/.offlineimaprc
+!/.offlineimap/ssh_config
 !/.var/offlineimap/.gitignore
 !/.var/offlineimap/.gitignore
diff --git a/.offlineimap/ssh_config b/.offlineimap/ssh_config
new file mode 100644 (file)
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 dfe3212891b9c0b0eff21c71c0c74c000469fbc2..85f642c486b5f9375f18ed0bb8a83cc9d9ad18c1 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -40,7 +40,7 @@ type = IMAP
 maxconnections = 5
 holdconnectionopen = yes
 ssh_host = madduck-net.imap.madduck.net
 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
 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
 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
 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.