Substitute in the location of ca certs for mail

3 files changed, 12 insertions, 7 deletions

diff --git a/.msmtprc b/.msmtprc
index 53950dd..112f580 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -8,8 +8,8 @@ port 587
 from rak@debian.org
 tls on
 tls_starttls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls_min_dh_prime_bits 1024
+tls_trust_file SSL_CERTS
 auth on
 user ryanakca@gmail.com
 password GMAIL_PASS
@@ -19,7 +19,7 @@ host mail.queensu.ca
 port 465
 tls on
 tls_starttls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
+tls_trust_file SSL_CERTS
 tls_certcheck on
 auth on
 user 9rak
@@ -31,8 +31,8 @@ port 587
 from ryanakca@ubuntu.com
 tls on
 tls_starttls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls_min_dh_prime_bits 1024
+tls_trust_file SSL_CERTS
 auth on
 user ryanakca@gmail.com
 password GMAIL_PASS
@@ -43,8 +43,8 @@ port 587
 from ryanakca@kubuntu.org
 tls on
 tls_starttls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls_min_dh_prime_bits 1024
+tls_trust_file SSL_CERTS
 auth on
 user ryanakca@gmail.com
 password GMAIL_PASS
@@ -55,8 +55,8 @@ port 587
 from ryan@cs.queensu.ca
 tls on
 tls_starttls on
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls_min_dh_prime_bits 1024
+tls_trust_file SSL_CERTS
 auth on
 user ryanakca@gmail.com
 password GMAIL_PASS
@@ -79,8 +79,8 @@ 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_prime_bits 1024
+tls_trust_file SSL_CERTS
 auth login
 domain mail.mcgill.ca
 user ryan.kavanagh@mail.mcgill.ca
diff --git a/Makefile b/Makefile
index e644a5d..dd2fbc0 100755
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ 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 MCGSOCS_PASS MCGILL_PASS
+VARS_.msmtprc           = GMAIL_PASS QUEENSU_PASS LOCALHOST MCGSOCS_PASS MCGILL_PASS SSL_CERTS
 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
diff --git a/SUBSTS b/SUBSTS
index d973ca6..a8392c2 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -60,4 +60,9 @@ GSD_PATH /usr/local/libexec/gnome-settings-daemon
 # Enable keychain? If so, set to True
 KEYCHAIN True
 
+# Path to SSL certs for mail, etc.
+# /etc/ssl/cert.pem on OpenBSD
+# /etc/ssl/certs/ca-certificates.crt on Debian
+SSL_CERTS /etc/ssl/cert.pem
+
 LOCALHOST epsilon.ryanak.ca