Added McGill email address

5 files changed, 72 insertions, 4 deletions

diff --git a/.msmtprc b/.msmtprc
index 9a29ef0..5f5b885 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -60,3 +60,27 @@ tls_min_dh_prime_bits 1024
 auth on
 user ryanakca@gmail.com
 password GMAIL_PASS
+
+account mcgillsocs
+host mail.cs.mcgill.ca
+port 465
+from ryank@cs.mcgill.ca
+tls on
+tls_starttls on
+tls_trust_file /home/ryan/.mutt/certs/mcgillsocs.crt
+tls_min_dh_prime_bits 1024
+auth on
+user ryank
+password MCGSOCS_PASS
+
+account mcgill
+host smtp.mcgill.ca
+port 587
+from ryan.kavanagh@mail.mcgill.ca
+tls on
+tls_starttls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+tls_min_dh_prim_bits 1024
+auth on
+user ryan.kavanagh@mail.mcgill.ca
+password MCGILL_PASS
diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
index 2b73d0c..64446a6 100644
--- a/.mutt/accounts.rc
+++ b/.mutt/accounts.rc
@@ -59,6 +59,16 @@ set pager_format = '-%Z-QUEENS: %C/%m: %-20.20n %s';\
 set compose_format = '-- QUEENS: Compose [Approx. msg size: %l Atts: %a]%>-';\
 set status_format = '-%r-QUEENS: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
+folder-hook .*McGill.* \
+"unhook send-hook;\
+set from = ryan.kavanagh@mail.mcgill.ca;\
+set sendmail="MSMTP_PATH -a mcgill"
+set record='=McGill.Sent Items';\
+set postponed='=McGill.Drafts';\
+set pager_format = '-%Z-McGILL: %C/%m: %-20.20n %s';\
+set compose_format = '-- McGILL: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-McGILL: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
+
 folder-hook /var/mail/ryan \
 "set mbox_type = Maildir;\
 set folder = /var/mail/ryan;\
diff --git a/.offlineimaprc b/.offlineimaprc
index eeb2c4a..eb81b03 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -3,7 +3,7 @@
 
 [general]
 metadata = ~/.offlineimap
-accounts = GMAIL, QueensU, McGillSOCS
+accounts = GMAIL, QueensU, McGillSOCS, McGill
 #, GMAIL
 pythonfile=~/.offlineimap.py
 # EIMEAR
@@ -104,6 +104,39 @@ folderfilter = lambda folder: folder.startswith('McGSOCS.')
 # Remove McGSOCS prefix when copying to remote
 nametrans = lambda folder: re.sub('^McGSOCS.', '', folder)
 
+#### McGill mail
+[Account McGill]
+localrepository = LocalMcGill
+remoterepository = RemoteMcGill
+autorefresh = 20
+quick = 10
+# presynchook = imapfilter
+foldersort = lamba x, y: cmp(x, y)
+postsynchook = /home/ryan/bin/run-mailcheck && notmuch new
+
+[Repository RemoteMcGill]
+foldersort = lambda x, y: cmp(y, x)
+type = IMAP
+remoteuser = ryan.kavanagh@mail.mcgill.ca
+remotehost = exchange.mcgill.ca
+remotepass = MCGILL_PASS
+remortport = 993
+ssl = yes
+# cert_fingerprint = 20:7B:11:4F:C9:CD:4A:52:F5:86:A3:50:A4:DF:AB:05:C5:C7:AD:8B
+# sslcacertfile = /home/ryan/.mutt/certs/mcgillsocs.crt
+# Add McGSOCS prefix when copying to local
+nametrans = lambda foldername: 'McGill.' + foldername
+
+[Repository LocalMcGill]
+type = IMAP
+remotehost = localhost
+remoteuser = ryan
+remotepass = LOCAL_PASS
+# Only copy folders from local to remote if they start with McGSOCS
+folderfilter = lambda folder: folder.startswith('McGill.')
+# Remove McGSOCS prefix when copying to remote
+nametrans = lambda folder: re.sub('^McGill.', '', folder)
+
 [mbnames]
 enabled = no
 filename = .muttrc.mailboxes
diff --git a/SUBSTS b/SUBSTS
index 28d0be8..d973ca6 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -12,6 +12,7 @@ GPG_DISABLED False
 GMAIL_PASS secret
 QUEENSU_PASS secret
 MCGSOCS_PASS secret
+MCGILL_PASS secret
 LOCAL_PASS secret
 # xmonad
 XMONAD_DZEN_W 808
diff --git a/dm b/dm
index 74b190d..c475d7d 100755
--- a/dm
+++ b/dm
@@ -76,12 +76,12 @@ GPG_DISABLED  = $(call get-val,GPG_DISABLED)
 VARS_.devscripts        = MSMTP_PATH
 VARS_.gitconfig         = MSMTP_PATH
 VARS_.imapfilter/config.lua = LOCAL_PASS PM_EMAIL
-VARS_.msmtprc           = GMAIL_PASS QUEENSU_PASS LOCALHOST
-VARS_.mutt/accounts.rc  = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MSMTP_PATH
+VARS_.msmtprc           = GMAIL_PASS QUEENSU_PASS LOCALHOST MCGSOCS_PASS MCGILL_PASS
+VARS_.mutt/accounts.rc  = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MSMTP_PATH MCGILL_PASS
 VARS_.mutt/score.rc     = MUTT_10_SCORE MUTT_20_SCORE
 VARS_.muttrc            = MSMTP_PATH
 VARS_.netrc             = LOCAL_PASS
-VARS_.offlineimaprc     = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MCGSOCS_PASS
+VARS_.offlineimaprc     = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MCGSOCS_PASS MCGILL_PASS
 VARS_.screenrc          = ZSH_PATH SCREEN_HOST_COLOUR
 VARS_.xinitrc           = SCREENLAYOUT REDSHIFT_MODE GSD_PATH
 VARS_.xmonad/xmonad.hs  = XMONAD_DZEN_W XMONAD_DZEN_X XMONAD_DZEN_Y