emacs: update packages, switch from bbdb back to ebdb for now

[~bandali/configs] / .config / msmtp / config

diff --git a/.config/msmtp/config b/.config/msmtp/config
index 3c0aaa0..424b33b 100644 (file)
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -6,32 +6,31 @@ auth on
 #tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile ~/.msmtp.log
 
-# amin
-account amin
+account shemshak
 host mail.shemshak.org
-# use `msmtp -a amin --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint 2F:48:C6:F4:BA:AB:3F:52:84:06:56:33:4B:29:57:84:0F:74:1B:DB:C1:83:25:03:67:05:9A:D4:2A:CE:D4:00
+# use `msmtp -a shemshak --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
+tls_fingerprint E3:FD:00:EA:5C:38:51:F4:13:B4:8C:E5:1F:1B:98:B4:22:82:17:D6:92:5D:AB:76:3F:2D:60:7D:D3:BB:C2:FD
 tls_starttls on
 from amin@shemshak.org
 user amin@shemshak.org
-passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/shemshak.gpg
 
-account aminb : amin
+account aminb : shemshak
 from amin@aminb.org
-account bndl : amin
+account bndl : shemshak
 from amin@bndl.org
+account mab : shemshak
+from mab@shemshak.org
 
-# gnu
 account gnu
 host fencepost.gnu.org
 # use `msmtp -a gnu --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint 13:CE:26:A2:60:33:FB:E0:B1:3E:91:06:AD:67:7A:A3:55:40:BA:04:80:D4:A7:DC:EE:35:89:E8:B6:58:94:AF
+tls_fingerprint 0A:F3:2D:2B:56:D1:AF:8A:55:15:1D:B2:BA:39:BF:21:7F:6A:46:BA:7D:EE:5F:B1:8F:13:17:CE:9E:4B:8E:87
 tls_starttls on
 from bandali@gnu.org
 user bandali
-passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/gnu.gpg
 
-# gnu (old)
 account gnu-aminb : gnu
 from aminb@gnu.org
 account gnu-amin : gnu
@@ -39,23 +38,27 @@ from amin@gnu.org
 account gnu-mab : gnu
 from mab@gnu.org
 
-# uwaterloo
 account uwaterloo
 host connect.uwaterloo.ca
 tls_starttls on
 from abandali@uwaterloo.ca
 user abandali
-passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/uwaterloo.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
-# csclub
+account uwaterloo-friendly : uwaterloo
+from bandali@uwaterloo.ca
+
 account csclub
 host mail.csclub.uwaterloo.ca
 tls_starttls on
 from abandali@csclub.uwaterloo.ca
 user abandali
-passwordeval gpg2 --no-tty -q -d ~/.passwd/csclub.gpg
+passwordeval gpg --no-tty -q -d ~/.passwd/csclub.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account csclub-friendly : csclub
+from bandali@csclub.uwaterloo.ca
+
 # Set a default account
-account default : amin
+account default : shemshak