Add aber email, remove student and musoft.

diff --git a/offline_mail/.mail_pass/aber.gpg b/offline_mail/.mail_pass/aber.gpg
new file mode 100644 (file)
index 0000000..bb1fb4f
Binary files /dev/null and b/offline_mail/.mail_pass/aber.gpg differ

diff --git a/offline_mail/.mail_pass/musoft.gpg b/offline_mail/.mail_pass/musoft.gpg
deleted file mode 100644 (file)
index 55282fc..0000000
Binary files a/offline_mail/.mail_pass/musoft.gpg and /dev/null differ

diff --git a/offline_mail/.mail_pass/student.gpg b/offline_mail/.mail_pass/student.gpg
deleted file mode 100644 (file)
index 7ebf94e..0000000
Binary files a/offline_mail/.mail_pass/student.gpg and /dev/null differ

diff --git a/offline_mail/.mbsync/aber.mbsync b/offline_mail/.mbsync/aber.mbsync
new file mode 100644 (file)
index 0000000..58c4c97
--- /dev/null
+++ b/offline_mail/.mbsync/aber.mbsync
@@ -0,0 +1,20 @@
+IMAPAccount aber
+Host outlook.office365.com 
+User maf54@aber.ac.uk 
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/aber.gpg"
+UseIMAPS yes
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore aber-remote
+Account aber
+
+MaildirStore aber-local
+Path ~/mail/aber/
+Inbox ~/mail/aber/Inbox
+
+Channel aber 
+Master :aber-remote:
+Slave :aber-local:
+Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail"
+Create Both
+SyncState *

diff --git a/offline_mail/.mbsync/musoft.mbsync b/offline_mail/.mbsync/musoft.mbsync
deleted file mode 100644 (file)
index 41b3dc2..0000000
--- a/offline_mail/.mbsync/musoft.mbsync
+++ /dev/null
@@ -1,49 +0,0 @@
-IMAPAccount gmail
-Host imap.gmail.com
-User max@musoft.co.uk
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/musoft.gpg"
-UseIMAPS yes
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
-Path ~/mail/musoft/
-Inbox ~/mail/musoft/Inbox
-
-Channel gmail-sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:Sent
-SyncState *
-Create Slave
-
-Channel gmail-all-mail
-Master :gmail-remote:"[Gmail]/All Mail"
-Slave :gmail-local:"All Mail"
-SyncState *
-Create Slave
-
-Channel gmail-all-drafts
-Master :gmail-remote:"[Gmail]/Drafts"
-Slave :gmail-local:"Drafts"
-SyncState *
-Create Slave
-
-Channel gmail-all-spam
-Master :gmail-remote:"[Gmail]/Spam"
-Slave :gmail-local:"Spam"
-SyncState *
-Create Slave
-
-Channel gmail-default
-Master :gmail-remote:
-Slave :gmail-local:
-Patterns "INBOX"
-SyncState *
-Create Slave
-
-Group gmail
-Channel gmail-default
-Channel gmail-sent
-Channel gmail-all-mail

diff --git a/offline_mail/.mbsync/student.mbsync b/offline_mail/.mbsync/student.mbsync
deleted file mode 100644 (file)
index f0afe9e..0000000
--- a/offline_mail/.mbsync/student.mbsync
+++ /dev/null
@@ -1,20 +0,0 @@
-IMAPAccount student
-Host outlook.office365.com 
-User mf195@student.le.ac.uk 
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/student.gpg"
-UseIMAPS yes
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore student-remote
-Account student 
-
-MaildirStore student-local
-Path ~/mail/student/
-Inbox ~/mail/student/Inbox
-
-Channel student 
-Master :student-remote:
-Slave :student-local:
-Patterns "INBOX" "Drafts" "Sent" "Trash" "Junk E-Mail"
-Create Both
-SyncState *

diff --git a/offline_mail/.mutt/account.aber b/offline_mail/.mutt/account.aber
new file mode 100644 (file)
index 0000000..a7e2761
--- /dev/null
+++ b/offline_mail/.mutt/account.aber
@@ -0,0 +1,11 @@
+set from = "maf54@aber.ac.uk"
+set realname = "Maximilian Friedersdorff"
+set sendmail = "/usr/bin/msmtp --account=aber"
+
+set spoolfile = "+aber/Inbox"
+set postponed = "+aber/Drafts"
+set trash = "+aber/Trash"
+set record = "+aber/Sent"
+
+set header_cache = ~/.mutt/aber/cache/headers
+set certificate_file = ~/.mutt/aber/certificates

diff --git a/offline_mail/.mutt/account.musoft b/offline_mail/.mutt/account.musoft
deleted file mode 100644 (file)
index 625f123..0000000
--- a/offline_mail/.mutt/account.musoft
+++ /dev/null
@@ -1,13 +0,0 @@
-set from = "max@musoft.co.uk"
-set realname = "Maximilian Friedersdorff"
-set sendmail = "/usr/bin/msmtp --account=musoft"
-
-set spoolfile = "+musoft/INBOX"
-set postponed = "+musoft/Drafts"
-set trash = ""
-set record = ""
-
-set header_cache = ~/.mutt/musoft/cache/headers
-set certificate_file = ~/.mutt/musoft/certificates
-
-set pgp_sign_as="0x2EA4B143"

diff --git a/offline_mail/.mutt/account.student b/offline_mail/.mutt/account.student
deleted file mode 100644 (file)
index 48c5aea..0000000
--- a/offline_mail/.mutt/account.student
+++ /dev/null
@@ -1,13 +0,0 @@
-set from = "mf195@student.le.ac.uk"
-set realname = "Maximilian Friedersdorff"
-set sendmail = "/usr/bin/msmtp --account=student"
-
-set spoolfile = "+student/Inbox"
-set postponed = "+student/Drafts"
-set trash = "+student/Trash"
-set record = "+student/Sent"
-
-set header_cache = ~/.mutt/student/cache/headers
-set certificate_file = ~/.mutt/student/certificates
-
-set pgp_sign_as="0x33FA1EFF"

diff --git a/offline_mail/.mutt/mutt_with_mbsync.sh b/offline_mail/.mutt/mutt_with_mbsync.sh
index 67412204e837bdc3aaf24bf6462abe9cde255ac0..83f7d54e871fafade7df169bae19ba72021fbeac 100755 (executable)
--- a/offline_mail/.mutt/mutt_with_mbsync.sh
+++ b/offline_mail/.mutt/mutt_with_mbsync.sh
@@ -19,8 +19,7 @@ sync_mailboxes()
 {
   /usr/bin/mbsync -c /home/max/.mbsync/personal.mbsync -a >> $LOG 2>&1
   /usr/bin/mbsync -c /home/max/.mbsync/personal-gmail.mbsync -a >> $LOG 2>&1
-  /usr/bin/mbsync -c /home/max/.mbsync/student.mbsync -a >> $LOG 2>&1
-  /usr/bin/mbsync -c /home/max/.mbsync/musoft.mbsync -a >> $LOG 2>&1
+  /usr/bin/mbsync -c /home/max/.mbsync/aber.mbsync -a >> $LOG 2>&1
 }
 
 sync_mailboxes_loop()

diff --git a/offline_mail/.mutt/muttrc b/offline_mail/.mutt/muttrc
index b4e310c0394bc2d9e2402851d9fd0fa5dbc6c31c..651e8c4c653495af0023f94a2b92b6db4350fed5 100644 (file)
--- a/offline_mail/.mutt/muttrc
+++ b/offline_mail/.mutt/muttrc
@@ -2,13 +2,11 @@ set folder = ~/mail
 
 folder-hook personal/* source ~/.mutt/account.personal
 folder-hook personal-gmail/* source ~/.mutt/account.personal-gmail
-folder-hook student/* source ~/.mutt/account.student
-folder-hook musoft/* source ~/.mutt/account.musoft
+folder-hook aber/* source ~/.mutt/account.aber
 
 macro index \e1 '<change-folder>~/mail/personal/Inbox<enter>'
 macro index \e2 '<change-folder>~/mail/personal-gmail/Inbox<enter>'
-macro index \e3 '<change-folder>~/mail/student/Inbox<enter>'
-macro index \e4 '<change-folder>~/mail/musoft/Inbox<enter>'
+macro index \e3 '<change-folder>~/mail/aber/Inbox<enter>'
 
 source ~/.mutt/account.personal