X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5278b58a9efffc9e9850104091d8d93551118036..217ecdcf208fb4e4b94c3dcc25c57baf6b66e83e:/mbsync/config

diff --git a/mbsync/config b/mbsync/config
index aa3d76e..9977a39 100644
--- a/mbsync/config
+++ b/mbsync/config
@@ -10,6 +10,7 @@ User            samirbenmendil
 PassCmd         "sed -En '/imap.mailfence.com.*samirbenmendil/ s/.*password (.*)/\\1/p' ~/.netrc"
 AuthMechs       LOGIN
 SSLType         IMAPS
+SSLVersions     TLSv1.2
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore mailfence-remote
@@ -20,120 +21,45 @@ Path         ~/mail/mailfence/
 Inbox        ~/mail/mailfence/inbox
 SubFolders   Verbatim
 
-Channel mailfence-inbox
-Master  :mailfence-remote:
-Slave   :mailfence-local:
+Channel mailfence/inbox
+Far  :mailfence-remote:
+Near :mailfence-local:
 Patterns INBOX
 
-Channel mailfence-drafts
-Master  :mailfence-remote:"Drafts"
-Slave   :mailfence-local:"drafts"
+Channel mailfence/drafts
+Far  :mailfence-remote:"Drafts"
+Near :mailfence-local:"drafts"
 
-Channel mailfence-sent
-Master  :mailfence-remote:"Sent Items"
-Slave   :mailfence-local:"sent"
+Channel mailfence/sent
+Far  :mailfence-remote:"Sent Items"
+Near :mailfence-local:"sent"
 
-Channel mailfence-spam
-Master  :mailfence-remote:"Spam?"
-Slave   :mailfence-local:"spam"
+Channel mailfence/spam
+Far  :mailfence-remote:"Spam?"
+Near :mailfence-local:"spam"
 
-Channel mailfence-bin
-Master  :mailfence-remote:"Trash"
-Slave   :mailfence-local:"trash"
+Channel mailfence/bin
+Far  :mailfence-remote:"Trash"
+Near :mailfence-local:"trash"
 
-Channel mailfence-youtube
-Master  :mailfence-remote:
-Slave   :mailfence-local:
+Channel mailfence/youtube
+Far  :mailfence-remote:
+Near :mailfence-local:
 Patterns youtube*
 
-Channel mailfence-archive
-Master  :mailfence-remote:
-Slave   :mailfence-local:
+Channel mailfence/archive
+Far  :mailfence-remote:
+Near :mailfence-local:
 Patterns archive*
 
 Group mailfence
-Channel mailfence-inbox
-Channel mailfence-drafts
-Channel mailfence-sent
-Channel mailfence-spam
-Channel mailfence-bin
-Channel mailfence-youtube
-Channel mailfence-archive
-
-IMAPAccount     gmail
-Host            imap.gmail.com
-User            samir.benmendil@gmail.com
-PassCmd         "sed -En '/imap.gmail.com.*samir.benmendil@gmail.com/ s/.*password (.*)/\\1/p' ~/.netrc"
-AuthMechs       LOGIN
-SSLType         IMAPS
-SSLVersion      SSLv3
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
-Path         ~/mail/gmail/
-Inbox        ~/mail/gmail/inbox/
-SubFolders   Verbatim
-
-Channel gmail-default
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "INBOX"
-
-Channel gmail-youtube
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube"
-
-Channel gmail-youtube-watch.later
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-watch.later"
-
-Channel gmail-youtube-orig
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-orig"
-
-Channel gmail-archive
-Master :gmail-remote:"[Google Mail]/All Mail"
-Slave :gmail-local:"archive"
-
-Channel gmail-drafts
-Master :gmail-remote:"[Google Mail]/Drafts"
-Slave :gmail-local:"drafts"
-
-Channel gmail-sent
-Master :gmail-remote:"[Google Mail]/Sent Mail"
-Slave :gmail-local:"sent"
-
-Channel gmail-spam
-Master :gmail-remote:"[Google Mail]/Spam"
-Slave :gmail-local:"spam"
-
-Channel gmail-flagged
-Master :gmail-remote:"[Google Mail]/Starred"
-Slave :gmail-local:"flagged"
-
-Channel gmail-bin
-Master :gmail-remote:"[Google Mail]/Bin"
-Slave :gmail-local:"bin"
-
-Group gmail
-Channel gmail-default
-Channel gmail-drafts
-Channel gmail-sent
-Channel gmail-spam
-Channel gmail-flagged
-Channel gmail-bin
-
-Group gmail-more
-Channel gmail-youtube
-Channel gmail-youtube-watch.later
-Channel gmail-youtube-orig
-Channel gmail-archive
+Channel mailfence/inbox
+Channel mailfence/drafts
+Channel mailfence/sent
+Channel mailfence/spam
+Channel mailfence/bin
+Channel mailfence/youtube
+Channel mailfence/archive
 
 IMAPAccount     fpp
 Host            imap.gmail.com
@@ -141,7 +67,6 @@ User            samir@fppnt.com
 PassCmd         "sed -En '/imap.gmail.com.*samir@fppnt.com/ s/.*password (.*)/\\1/p' ~/.netrc"
 AuthMechs       LOGIN
 SSLType         IMAPS
-SSLVersion      SSLv3
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore fpp-remote
@@ -153,33 +78,33 @@ Inbox        ~/mail/fpp/inbox/
 SubFolders   Verbatim
 
 Channel fpp-default
-Master  :fpp-remote:
-Slave   :fpp-local:
+Far  :fpp-remote:
+Near :fpp-local:
 Patterns "INBOX"
 
 Channel fpp-archive
-Master :fpp-remote:"[Gmail]/All Mail"
-Slave :fpp-local:"archive"
+Far  :fpp-remote:"[Gmail]/All Mail"
+Near :fpp-local:"archive"
 
 Channel fpp-drafts
-Master :fpp-remote:"[Gmail]/Drafts"
-Slave :fpp-local:"drafts"
+Far  :fpp-remote:"[Gmail]/Drafts"
+Near :fpp-local:"drafts"
 
 Channel fpp-sent
-Master :fpp-remote:"[Gmail]/Sent Mail"
-Slave :fpp-local:"sent"
+Far  :fpp-remote:"[Gmail]/Sent Mail"
+Near :fpp-local:"sent"
 
 Channel fpp-spam
-Master :fpp-remote:"[Gmail]/Spam"
-Slave :fpp-local:"spam"
+Far  :fpp-remote:"[Gmail]/Spam"
+Near :fpp-local:"spam"
 
 Channel fpp-flagged
-Master :fpp-remote:"[Gmail]/Starred"
-Slave :fpp-local:"flagged"
+Far  :fpp-remote:"[Gmail]/Starred"
+Near :fpp-local:"flagged"
 
 Channel fpp-bin
-Master :fpp-remote:"[Gmail]/Trash"
-Slave :fpp-local:"bin"
+Far  :fpp-remote:"[Gmail]/Trash"
+Near :fpp-local:"bin"
 
 Group fpp
 Channel fpp-default