rename seamus to main account

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 573dd20bda8325af9a8910224dd065b65aa71616..590e201a4264a560fbfee4fc366064c2ba04953d 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -7,7 +7,7 @@ full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
 prioritised = ['outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 prioritised = ['outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 

-def py_foldersort_seamus(x, y):
+def py_foldersort_main(x, y):

     for prefix in prioritised:
         if x.startswith(prefix):
             return -1
     for prefix in prioritised:
         if x.startswith(prefix):
             return -1


@@ -20,7 +20,7 @@ def py_foldersort_seamus(x, y):
             return -1
     return cmp(x, y)
 
             return -1
     return cmp(x, y)
 

-def py_nametrans_seamus(x):
+def py_nametrans_main(x):

     return re.sub('^INBOX', 'inbox', x)
 
 def should_do_full_sync():
     return re.sub('^INBOX', 'inbox', x)
 
 def should_do_full_sync():


@@ -47,8 +47,7 @@ def should_do_full_sync():
 
     return False
 
 
     return False
 

-def py_folderfilter_seamus(x):
-
+def py_folderfilter_main(x):

     if x in base_excludes:
         return False
 
     if x in base_excludes:
         return False
 


@@ -59,5 +58,5 @@ def py_folderfilter_seamus(x):
 
 def py_folderfilter_mbnames(acct, x):
     full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
 
 def py_folderfilter_mbnames(acct, x):
     full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re

-    return acct in ['seamus.madduck.net'] \
+    return acct in ['madduck.net'] \

             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)

diff --git a/.offlineimaprc b/.offlineimaprc
index da0b7a4a112a37b050395211950401feaefef221..2d15b607af24d86b49302f7456c20be24c3e29b8 100644 (file)
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 metadata = ~/.var/offlineimap
 [general]
 metadata = ~/.var/offlineimap

-accounts = seamus.madduck.net
+accounts = madduck.net

 ui = Noninteractive.Basic, Noninteractive.Quiet
 ignore-readonly = no
 socktimeout = 30
 ui = Noninteractive.Basic, Noninteractive.Quiet
 ignore-readonly = no
 socktimeout = 30


@@ -17,27 +17,26 @@ sep = '\n'
 footer = '\n'
 folderfilter = py_folderfilter_mbnames
 
 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
 
 autorefresh = 15
 quick = 16
 

-[Repository local-seamus]
+[Repository local-main]

 type = Maildir
 localfolders = ~/mail
 sep = /
 
 type = Maildir
 localfolders = ~/mail
 sep = /
 

-[Repository seamus.madduck.net]
+[Repository madduck.net]

 type = IMAP
 maxconnections = 3
 holdconnectionopen = yes
 type = IMAP
 maxconnections = 3
 holdconnectionopen = yes

-remoteuser = madduck
-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 seamus.madduck.net
+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
 expunge = yes

-foldersort = py_foldersort_seamus
-nametrans = py_nametrans_seamus
-folderfilter = py_folderfilter_seamus
+foldersort = py_foldersort_main
+nametrans = py_nametrans_main
+folderfilter = py_folderfilter_main

 idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
 [Account logcheck]
 idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
 [Account logcheck]