X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/60b6943f1562471884e69d277785a57303cff155..741c74bb6415a8559e379bd4510c4cb5817a7f47:/.offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index 4bb5f3b..ad8b0c8 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,9 +1,8 @@
 [general]
 metadata = ~/.var/offlineimap
 accounts = madduck.net
-ui = Noninteractive.Basic, Noninteractive.Quiet
+ui = Basic
 ignore-readonly = no
-socktimeout = 30
 pythonfile = ~/.offlineimap/helper.py
 fsync = no
 #maxsyncaccounts = 2
@@ -22,12 +21,14 @@ localrepository = local-main
 remoterepository = madduck.net
 autorefresh = 15
 quick = 16
+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
 
 [Repository local-main]
 type = Maildir
@@ -36,41 +37,23 @@ 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
+imap_command = MAIL=$HOME/.maildir /usr/lib/dovecot/imap 2>/dev/null
+preauthtunnel = exec ~/.offlineimap/preauthtunnel.sh %(ssh_host)s %(imap_command)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 = 3
-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
-expunge = yes
-folderfilter = py_folderfilter_bulk
-
-[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
+holdconnectionopen = no
+ssh_host = madduck-net.imap.madduck.net
+imap_command = MAIL=$HOME/.maildir /usr/lib/dovecot/imap 2>/dev/null
+preauthtunnel = exec ~/.offlineimap/preauthtunnel.sh %(ssh_host)s %(imap_command)s
 expunge = yes
-nametrans = lambda folder: re.sub('^INBOX', 'todo', folder)
+folderfilter = py_folderfilter_bulk
+foldersort = py_foldersort_main