From 3e43236f3da75e73c1d618c5379a3ed485d8b9c4 Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Sun, 30 Aug 2015 15:30:39 -0400 Subject: Fix nailrc for CMU SCS --- .msmtprc | 47 ++++++----------------------------------------- .nailrc | 13 +++++++------ Makefile | 2 +- SUBSTS | 2 ++ 4 files changed, 16 insertions(+), 48 deletions(-) diff --git a/.msmtprc b/.msmtprc index 5a67df2..1ace606 100644 --- a/.msmtprc +++ b/.msmtprc @@ -58,29 +58,6 @@ auth on user ryanakca@gmail.com password GMAIL_PASS -account mcgillsocs -from ryank@cs.mcgill.ca -host mail.cs.mcgill.ca -port 465 -tls on -tls_starttls on -tls_trust_file /home/ryan/.mutt/certs/mcgillsocs.crt -auth on -user ryank -password MCGSOCS_PASS - -account mcgill -from ryan.kavanagh@mail.mcgill.ca -host smtp.mcgill.ca -port 587 -tls on -tls_starttls on -tls_trust_file SSL_CERTS -auth login -domain mail.mcgill.ca -user ryan.kavanagh@mail.mcgill.ca -password MCGILL_PASS - account ryanakca from rak@ryanak.ca host hermes.ryanak.ca @@ -92,24 +69,12 @@ auth login user rak password RYANAKCA_PASS -account mit -from rakavan@mit.edu -host outgoing.mit.edu -port 587 -auth login -user rakavan -password MIT_PASS -tls on -tls_starttls on -tls_trust_file SSL_CERTS - -account mit-csail -from rakavan@csail.mit.edu -host outgoing.csail.mit.edu -port 587 -user rakavan -password CSAIL_PASS -auth cram-md5 +account cmuscs +from rkavanag@cs.cmu.edu +host smtp.srv.cs.cmu.edu tls on tls_starttls on tls_trust_file SSL_CERTS +autho on +user rkavanag +password CMUSCS_PASS diff --git a/.nailrc b/.nailrc index 44e1cc5..0cd935e 100644 --- a/.nailrc +++ b/.nailrc @@ -11,9 +11,9 @@ account l { account d { call clearset set folder=imap://ryan@localhost/ - set sendmail=/home/ryan/bin/msmtp/msmtp-default + set sendmail=HOMEDIR/bin/msmtp/msmtp-default set from="Ryan Kavanagh " - set smime-sign-cert-ryan@localhost="/home/ryan/ssl/mailx-debian.pem" + set smime-sign-cert-ryan@localhost="HOMEDIR/ssl/mailx-debian.pem" set smime-sign } @@ -21,9 +21,9 @@ account g { call clearset set folder=imaps://ryanakca@gmail.com@imap.gmail.com/ set password-ryanakca@gmail.com@imap.gmail.com=GMAIL_mailx_PASS - set sendmail=/home/ryan/bin/msmtp/msmtp-default + set sendmail=HOMEDIR/bin/msmtp/msmtp-default set from="Ryan Kavanagh " - set smime-sign-cert="/home/ryan/ssl/mailx-debian.pem" + set smime-sign-cert="HOMEDIR/ssl/mailx-debian.pem" set smime-sign set imap-keepalive=30 } @@ -33,7 +33,7 @@ account q { set folder=imap://ryan@localhost/QueensU.INBOX set record=@QueensU.Sent set MBOX=@QueensU.Read - set sendmail=/home/ryan/bin/msmtp/msmtp-queensu + set sendmail=HOMEDIR/bin/msmtp/msmtp-queensu set from="ryan.kavanagh@queensu.ca (Ryan Kavanagh)" unset smime-sign } @@ -55,6 +55,7 @@ account s { set folder=imaps://rkavanag@imap.srv.cs.cmu.edu/ set imap-starttls-rkavanag@imap.srv.cs.cmu.edu set password-rkavanag@imap.srv.cs.cmu.edu=CMUSCS_PASS + set sendmail=HOMEDIR/bin/msmtp/msmtp-cmuscs set MBOX=@INBOX.Read set record=@INBOX.Sent @@ -79,7 +80,7 @@ set PAGER="less -FXQR" set nss-config-dir="~/.mozilla/firefox/dbr0vzdh.default/" -set imap-cache=/home/ryan/.mailx/cache +set imap-cache=HOMEDIR/.mailx/cache set imap-keepalive=60 set autosort=thread diff --git a/Makefile b/Makefile index 8e9224a..5e7a59e 100755 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ VARS_.mutt/gpg.rc = GPG_BINARY PGPEWRAP_BINARY VARS_.mutt/score.rc = MUTT_10_SCORE MUTT_20_SCORE VARS_.mutt/ssl.rc = SSL_CERTS VARS_.muttrc = MSMTP_PATH -VARS_.nailrc = GMAIL_mailx_PASS RYANAKCA_PASS CMUSCS_PASS +VARS_.nailrc = GMAIL_mailx_PASS RYANAKCA_PASS CMUSCS_PASS HOMEDIR VARS_.netrc = LOCAL_PASS GMAIL_PASS VARS_.offlineimaprc = $(MAIL_PASS) SSL_CERTS VARS_.screenrc = ZSH_PATH SCREEN_HOST_COLOUR diff --git a/SUBSTS b/SUBSTS index c9f524d..fbcc356 100644 --- a/SUBSTS +++ b/SUBSTS @@ -81,3 +81,5 @@ PGPEWRAP_BINARY /usr/lib/mutt/pgpewrap # Start pulse and jackd? # Set to True to enable, anything else otherwise PULSE_JACKD True + +HOMEDIR /home/rak -- cgit v1.2.3