rename ssh key file to include host and not algo

[etc/offlineimap.git] / .offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index 0c4c12364554cffd5acbda902552a8d1ff6d15d6..dfe3212891b9c0b0eff21c71c0c74c000469fbc2 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,15 +1,10 @@
 [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
 
 [mbnames]
@@ -21,46 +16,42 @@ 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
+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
 
-[Repository local-seamus]
+[Repository local-main]
 type = Maildir
 localfolders = ~/mail
 sep = /
 
-[Repository seamus.madduck.net]
+[Repository madduck.net]
 type = IMAP
-maxconnections = 6
+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 20" -i ~/.offlineimap/id_rsa.imap@seamus seamus.madduck.net
+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
 expunge = yes
-foldersort = py_foldersort_seamus
-nametrans = py_nametrans_seamus
-folderfilter = py_folderfilter_seamus
-
-[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
 
-[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
+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
 expunge = yes
-nametrans = lambda folder: re.sub('^INBOX', 'todo', folder)
+folderfilter = py_folderfilter_bulk
+foldersort = py_foldersort_main