rename ssh key file to include host and not algo

[etc/offlineimap.git] / .offlineimaprc

diff --git a/.offlineimaprc b/.offlineimaprc
index 2d15b607af24d86b49302f7456c20be24c3e29b8..dfe3212891b9c0b0eff21c71c0c74c000469fbc2 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,9 +1,8 @@
 [general]
 metadata = ~/.var/offlineimap
 accounts = madduck.net
 [general]
 metadata = ~/.var/offlineimap
 accounts = madduck.net

-ui = Noninteractive.Basic, Noninteractive.Quiet
+ui = Basic

 ignore-readonly = no
 ignore-readonly = no

-socktimeout = 30

 pythonfile = ~/.offlineimap/helper.py
 fsync = no
 #maxsyncaccounts = 2
 pythonfile = ~/.offlineimap/helper.py
 fsync = no
 #maxsyncaccounts = 2


@@ -22,6 +21,14 @@ localrepository = local-main
 remoterepository = madduck.net
 autorefresh = 15
 quick = 16
 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-main]
 type = Maildir
 
 [Repository local-main]
 type = Maildir


@@ -30,33 +37,21 @@ sep = /
 
 [Repository madduck.net]
 type = IMAP
 
 [Repository madduck.net]
 type = IMAP

-maxconnections = 3
+maxconnections = 5

 holdconnectionopen = yes
 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_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_main
 expunge = yes
 foldersort = py_foldersort_main

-nametrans = py_nametrans_main
+nametrans = py_nametrans

 folderfilter = py_folderfilter_main
 folderfilter = py_folderfilter_main

-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 = /
-
-[Repository logcheck]
+[Repository madduck.net_bulk]

 type = IMAP
 type = IMAP

-remotehost = imap.madduck.net
-ssl = yes

 maxconnections = 1
 holdconnectionopen = 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
 expunge = yes

-nametrans = lambda folder: re.sub('^INBOX', 'todo', folder)
+folderfilter = py_folderfilter_bulk
+foldersort = py_foldersort_main