Ensure we use the right SSH key

[etc/offlineimap.git] / .offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index 9f318fad46e7436d44be78410d472c40bc30c053..83db8107351a38e46d18086a37cf397e814a3b7f 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,9 +1,8 @@
 [general]
 metadata = ~/.var/offlineimap
 accounts = madduck.net
-ui = basic
+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]
+[Account madduck.net_bulk]
 localrepository = local-main
-remoterepository = madduck.net-bulk
-autorefresh = 15
+remoterepository = madduck.net_bulk
+autorefresh = 360
 quick = 16
-postsynchook = ionice -c3 nice -20 notmuch new
+#postsynchook = ionice -c3 nice -20 notmuch new
 
 [Repository local-main]
 type = Maildir
@@ -38,42 +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" -i ~/.offlineimap/id_rsa.imap@seamus imap.madduck.net
+ssh_host = madduck-net.imap.madduck.net
+preauthtunnel = exec ~/.offlineimap/preauthtunnel.sh %(ssh_host)s
 expunge = yes
 foldersort = py_foldersort_main
-nametrans = py_nametrans_main
+nametrans = py_nametrans
 folderfilter = py_folderfilter_main
-idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
-[Repository madduck.net-bulk]
+[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
+holdconnectionopen = no
+ssh_host = madduck-net.imap.madduck.net
+preauthtunnel = exec ~/.offlineimap/preauthtunnel.sh %(ssh_host)s
 expunge = yes
 folderfilter = py_folderfilter_bulk
 foldersort = py_foldersort_main
-
-[Account logcheck]
-localrepository = local-logcheck
-remoterepository = logcheck
-autorefresh = 15
-quick = 16
-
-[Repository local-logcheck]
-type = Maildir
-localfolders = ~/mail/debian/logcheck
-sep = /
-
-[Repository logcheck]
-type = IMAP
-remotehost = imap.madduck.net
-ssl = yes
-maxconnections = 1
-holdconnectionopen = yes
-remoteuser = logcheck-todo@madduck.net
-remotepass = logcheck
-expunge = yes
-nametrans = lambda folder: re.sub('^INBOX', 'todo', folder)