Amend functions for new upstream version

[etc/offlineimap.git] / .offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index bf37e1956e524fa4b1d9afcdf02fecfb67b97f72..1a97e5ce34595ae6b6091900ea04009f84d9a4c3 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,9 +1,8 @@
 [general]
 metadata = ~/.var/offlineimap
-accounts = seamus.madduck.net
-ui = Noninteractive.Basic, Noninteractive.Quiet
+accounts = madduck.net
+ui = Basic
 ignore-readonly = no
-socktimeout = 30
 pythonfile = ~/.offlineimap/helper.py
 fsync = no
 #maxsyncaccounts = 2
@@ -17,47 +16,43 @@ sep = '\n'
 footer = '\n'
 folderfilter = py_folderfilter_mbnames
 
-[Account seamus.madduck.net]
-localrepository = local-seamus
-remoterepository = seamus.madduck.net
+[Account madduck.net]
+localrepository = local-main
+remoterepository = madduck.net
 autorefresh = 15
 quick = 16
+status_backend = sqlite
+#postsynchook = ionice -c3 nice -20 notmuch new
 
-[Repository local-seamus]
+[Account madduck.net_bulk]
+localrepository = local-main
+remoterepository = madduck.net_bulk
+autorefresh = 15
+quick = 16
+status_backend = sqlite
+#postsynchook = ionice -c3 nice -20 notmuch new
+
+[Repository local-main]
 type = Maildir
 localfolders = ~/mail
 sep = /
 
-[Repository seamus.madduck.net]
+[Repository madduck.net]
 type = IMAP
-maxconnections = 3
+maxconnections = 5
 holdconnectionopen = yes
-remoteuser = madduck
-preauthtunnel = SSH_AUTH_SOCK= ssh -CaxS ~/.var/offlineimap/ssh_ctl_sock -o "ControlMaster auto" -o "ProtocolKeepAlives 10" -o "ConnectTimeout 60" -i ~/.offlineimap/id_rsa.imap@seamus seamus.madduck.net
+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
 expunge = yes
-foldersort = py_foldersort_seamus
-nametrans = py_nametrans_seamus
-folderfilter = py_folderfilter_seamus
-idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
-
-[Account logcheck]
-localrepository = local-logcheck
-remoterepository = logcheck
-autorefresh = 15
-quick = 16
-
-[Repository local-logcheck]
-type = Maildir
-localfolders = ~/mail/debian/logcheck
-sep = /
+foldersort = py_foldersort_main
+nametrans = py_nametrans
+folderfilter = py_folderfilter_main
+idlefolders = ['inbox', 'ardex', 'immo', 'admin', 'debian']
 
-[Repository logcheck]
+[Repository madduck.net_bulk]
 type = IMAP
-remotehost = imap.madduck.net
-ssl = yes
 maxconnections = 1
 holdconnectionopen = yes
-remoteuser = logcheck-todo@madduck.net
-remotepass = logcheck
+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
-nametrans = lambda folder: re.sub('^INBOX', 'todo', folder)
+folderfilter = py_folderfilter_bulk
+foldersort = py_foldersort_main