X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/47ef6c45a569257fe228ac705b84d563182d91ce..bd99029e60ea5b8f5d1092faddd23a7ee32209dc:/.offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index 0438ee1..85f642c 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -3,7 +3,6 @@ metadata = ~/.var/offlineimap
 accounts = madduck.net
 ui = Basic
 ignore-readonly = no
-socktimeout = 30
 pythonfile = ~/.offlineimap/helper.py
 fsync = no
 #maxsyncaccounts = 2
@@ -22,14 +21,14 @@ localrepository = local-main
 remoterepository = madduck.net
 autorefresh = 15
 quick = 16
-postsynchook = ionice -c3 nice -20 notmuch new
+postsynchook = ! command -v notmuch >/dev/null || ionice -c3 nice -20 notmuch new
 
 [Account madduck.net_bulk]
 localrepository = local-main
 remoterepository = madduck.net_bulk
 autorefresh = 15
 quick = 16
-postsynchook = ionice -c3 nice -20 notmuch new
+#postsynchook = ionice -c3 nice -20 notmuch new
 
 [Repository local-main]
 type = Maildir
@@ -38,20 +37,21 @@ sep = /
 
 [Repository madduck.net]
 type = IMAP
-maxconnections = 3
+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 "IPQoS af12" -i ~/.offlineimap/id_rsa.imap@seamus imap.madduck.net
+ssh_host = madduck-net.imap.madduck.net
+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
 folderfilter = py_folderfilter_main
-idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
 [Repository madduck.net_bulk]
 type = IMAP
 maxconnections = 1
 holdconnectionopen = yes
-preauthtunnel = SSH_AUTH_SOCK= ssh -TCaxS ~/.var/offlineimap/ssh_ctl_sock -o "ControlMaster auto" -o "ProtocolKeepAlives 10" -o "ConnectTimeout 60" -i ~/.offlineimap/id_rsa.imap@seamus imap.madduck.net
+ssh_host = madduck-net.imap.madduck.net
+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