use vpn instead of straight ssh; ignore Drafts

diff --git a/.offlineimaprc b/.offlineimaprc
index 06a79b6fd655385e385a03c57eb60db199f358ce..31840684c76718462d403fcae24856862e4e21c3 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -20,7 +20,7 @@ remoteuser = don
 ssl = yes
 createfolders = False
 folderfilter = lambda foldername: not re.search('(^(lists|bugs|jobs|archives|spam|customflags)|/\.)', foldername)
-preauthtunnel = ssh -q linnode.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
+preauthtunnel = ssh -q linnode.vpn.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
 
 
 [Account Lists]
@@ -43,8 +43,8 @@ nametrans = lambda foldername: \
             re.sub('^lists.?', '', foldername)
 # Yeah, you have to mention the Mail dir, even though it
 # would seem intuitive that reference would trim it.
-folderfilter = lambda foldername: not re.search('(^(oftc|archives|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|buildd|spam|outbox|bugs|postponed|customflags|Trash))', foldername)
-preauthtunnel = ssh -q linnode.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
+folderfilter = lambda foldername: not re.search('(^(oftc|archives|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|buildd|spam|outbox|bugs|postponed|customflags|Trash|Drafts))', foldername)
+preauthtunnel = ssh -q linnode.vpn.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
 
 [Account Bugs]
 localrepository = LocalBugs
@@ -57,7 +57,7 @@ localfolders = ~/Mail/bugs
 [Repository RemoteBugs]
 type = IMAP
 createfolders = False
-remotehost = linnode.donarmstrong.com
+remotehost = linnode.vpn.donarmstrong.com
 remoteuser = don
 ssl = yes
 #reference = Mail
@@ -66,9 +66,9 @@ nametrans = lambda foldername: \
             re.sub('^bugs.?', '', foldername)
 # Yeah, you have to mention the Mail dir, even though it
 # would seem intuitive that reference would trim it.
-folderfilter = lambda foldername: not re.search('(^(oftc|lists|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|buildd|spam|outbox|archives|postponed|customflags|Trash))', foldername)
+folderfilter = lambda foldername: not re.search('(^(oftc|lists|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|buildd|spam|outbox|archives|postponed|customflags|Trash|Drafts))', foldername)
 
-preauthtunnel = ssh -q linnode.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
+preauthtunnel = ssh -q linnode.vpn.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
 
 
 
@@ -83,7 +83,7 @@ localfolders = ~/Mail/spam
 [Repository RemoteSpam]
 type = IMAP
 createfolders = False
-remotehost = linnode.donarmstrong.com
+remotehost = linnode.vpn.donarmstrong.com
 remoteuser = don
 ssl = yes
 #reference = Mail
@@ -92,9 +92,9 @@ nametrans = lambda foldername: \
             re.sub('^spam.?', '', foldername)
 # Yeah, you have to mention the Mail dir, even though it
 # would seem intuitive that reference would trim it.
-folderfilter = lambda foldername: not re.search('(^(oftc|lists|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|bugs|buildd|outbox|archives|postponed|customflags|Trash))', foldername)
+folderfilter = lambda foldername: not re.search('(^(oftc|lists|jobs|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|bugs|buildd|outbox|archives|postponed|customflags|Trash|Drafts))', foldername)
 
-preauthtunnel = ssh -q linnode.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
+preauthtunnel = ssh -q linnode.vpn.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
 
 [Account Jobs]
 localrepository = LocalJobs
@@ -106,12 +106,12 @@ localfolders = ~/Mail/jobs
 
 [Repository RemoteJobs]
 type = IMAP
-remotehost = linnode.donarmstrong.com
+remotehost = linnode.vpn.donarmstrong.com
 remoteuser = don
 ssl = yes
 createfolders = False
 
 
-folderfilter = lambda foldername: not re.search('(^(oftc|lists|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|spam|bugs|buildd|outbox|archives|postponed|customflags))', foldername)
+folderfilter = lambda foldername: not re.search('(^(oftc|lists|INBOX|TODO|chili_alarm|bdo_role|0_ldo_role|spam|bugs|buildd|outbox|archives|postponed|customflags|Trash|Drafts))', foldername)
 
-preauthtunnel = ssh -q linnode.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'
+preauthtunnel = ssh -q linnode.vpn.donarmstrong.com '/usr/lib/dovecot/imap -o mail_location=maildir:/home/don/Maildir:INBOX=/home/don/Maildir'