Added imap/etc

6 files changed, 31 insertions, 14 deletions

diff --git a/.msmtprc b/.msmtprc
index 5d2b62e..67b801c 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -69,6 +69,17 @@ auth login
 user rak
 password RYANAKCA_PASS
 
+account rakac
+from rak@rak.ac
+host smtp.ryanak.ca
+port 587
+tls on
+tls_starttls on
+tls_trust_file SSL_CERTS
+auth login
+user rak
+password RYANAKCA_PASS
+
 account cmuscs
 from rkavanagh@cs.cmu.edu
 host smtp.gmail.com
diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
index 9ae27d0..b9199e9 100644
--- a/.mutt/accounts.rc
+++ b/.mutt/accounts.rc
@@ -44,10 +44,10 @@ set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n %s';\
 set compose_format = '-- QUEENSU: Compose [Approx. msg size: %l Atts: %a]%>-';\
 set status_format = '-%r-QUEENSU: %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)---'"
 
-account-hook imaps://hermes.ryanak.ca \
+account-hook imaps://imap.ryanak.ca \
 "set imap_user = 'rak';\
 set imap_pass = 'RYANAKCA_PASS';\
-set folder = 'imaps://hermes.ryanak.ca/';\
+set folder = 'imaps://imap.ryanak.ca/';\
 set record = '=Sent';\
 set copy = 'yes';\
 set postponed = '=Drafts';\
@@ -151,10 +151,16 @@ macro compose <F5> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.g
 <edit-from><kill-line>Ryan Kavanagh <rak@debian.org><enter>' \
 "Send mail from Debian account"
 
-macro compose <F6> '<enter-command>set folder="imaps://hermes.ryanak.ca/"<enter>\
+macro compose <F6> '<enter-command>set folder="imaps://imap.ryanak.ca/"<enter>\
 <edit-fcc><kill-line>=Sent<enter>\
 <enter-command>set sendmail="MSMTP_PATH -a ryanakca"<enter>\
 <edit-from><kill-line>Ryan Kavanagh <rak@ryanak.ca><enter>' \
 "Send mail from ryanak.ca"
 
+macro compose <Esc><F6> '<enter-command>set folder="imaps://imap.ryanak.ca/"<enter>\
+<edit-fcc><kill-line>=Sent<enter>\
+<enter-command>set sendmail="MSMTP_PATH -a rakac"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <rak@rak.ac><enter>' \
+"Send mail from rak.ac"
+
 set certificate_file = '~/.mutt/certs/certificates'
diff --git a/.nailrc b/.nailrc
index 38b15c4..314598b 100644
--- a/.nailrc
+++ b/.nailrc
@@ -43,9 +43,9 @@ account q {
 account r {
     call clearset
     set from="Ryan Kavanagh <rak@ryanak.ca>"
-    set folder=imaps://rak@hermes.ryanak.ca/
-    set imap-starttls-rak@hermes.ryanak.ca
-    set password-rak@hermes.ryanak.ca=RYANAKCA_PASS
+    set folder=imaps://rak@imap.ryanak.ca/
+    set imap-starttls-rak@imap.ryanak.ca
+    set password-rak@imap.ryanak.ca=RYANAKCA_PASS
     set sendmail=HOMEDIR/bin/msmtp/msmtp-ryanakca
 
     set MBOX=@Read
@@ -77,8 +77,8 @@ account c {
 source ~/.mailx-aliases.rc
 source ~/.mailrc
 
-set password-rak@hermes.ryanak.ca=RYANAKCA_PASS
-set record=imaps://rak@hermes.ryanak.ca/Sent
+set password-rak@imap.ryanak.ca=RYANAKCA_PASS
+set record=imaps://rak@imap.ryanak.ca/Sent
 
 # Don't display X-Brightmail-Tracker header cruft
 ignore "X-Brightmail-Tracker"
diff --git a/.ssh/config b/.ssh/config
index 508b2a2..bd8210d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -60,19 +60,19 @@ Host upsilon
      HostName upsilon.ryanak.ca
 Host nu
      HostName nu.ryanak.ca
-Host alpha alpha.ryanak.ca
+Host alpha alpha.ryanak.ca alpha.rak.ac
      HostName alpha.ryanak.ca
      IdentityFile ~/.ssh/id_rsa-alpha
      User rak
-Host delta delta.ryanak.ca
+Host delta delta.ryanak.ca delta.rak.ac
      HostName delta.ryanak.ca
      IdentityFile ~/.ssh/id_rsa-delta
      User rak
-Host hermes hermes.ryanak.ca
+Host hermes hermes.ryanak.ca hermes.rak.ac
      HostName hermes.ryanak.ca
      IdentityFile ~/.ssh/id_rsa-hermes
      User rak
-Host ryanak.ca *.ryanak.ca alpha epsilon upsilon nu delta hermes
+Host ryanak.ca *.ryanak.ca rak.ac *.rak.ac alpha epsilon upsilon nu delta hermes
      UserKnownHostsFile ~/.ssh/known_hosts.d/ryanak.ca
      StrictHostKeyChecking yes
 ## CMU hosts
diff --git a/.ssh/known_hosts.d/ryanak.ca b/.ssh/known_hosts.d/ryanak.ca
index 02e37ae..0a6757b 100644
--- a/.ssh/known_hosts.d/ryanak.ca
+++ b/.ssh/known_hosts.d/ryanak.ca
@@ -1 +1 @@
-@cert-authority *.ryanak.ca,ryanak.ca ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca
+@cert-authority *.ryanak.ca,ryanak.ca,*.rak.ac,rak.ac ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca
diff --git a/.tmux-mail.conf b/.tmux-mail.conf
index e3d7e4f..80241b8 100644
--- a/.tmux-mail.conf
+++ b/.tmux-mail.conf
@@ -1,7 +1,7 @@
 source-file ~/.tmux.conf
 
 new-session -s mail -d -n mutt 'neomutt -f imaps://rkavanag%40andrew.cmu.edu@imap.gmail.com'
-split-window -c '~' 'neomutt -f imaps://hermes.ryanak.ca'
+split-window -c '~' 'neomutt -f imaps://imap.ryanak.ca'
 split-window -c '~' -h 'neomutt -f imaps://ryanakca@gmail.com@imap.gmail.com/'
 new-window -d -c '~' -n hermes 'ssh hermes.ryanak.ca'
 new-session -s mus -A -n ncmpcpp -c '~' 'ncmpcpp'