msmtp: move config to $XDG_CONFIG_HOME/msmtp

diff --git a/.config/msmtp/config b/.config/msmtp/config
new file mode 100644 (file)
index 0000000..b04d471
--- /dev/null
+++ b/.config/msmtp/config
@@ -0,0 +1,59 @@
+# Set default values for all following accounts.
+defaults
+port 587
+tls on
+auth on
+#tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile ~/.msmtp.log
+
+# amin
+account amin
+host mail.bndl.org
+# use `msmtp -a amin --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
+tls_fingerprint 2A:78:50:28:E5:7E:DB:E4:E8:98:F1:A9:45:4E:97:41:F9:D7:78:CC:9B:84:04:B6:6A:9B:E1:C6:20:EE:0D:8B
+tls_starttls on
+from amin@bndl.org
+user amin@bndl.org
+passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
+
+account aminb : amin
+from amin@aminb.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 2B:CF:6A:F6:B5:9A:49:BC:40:61:2F:00:A8:E2:4B:75:D7:EB:18:94:09:68:6B:90:80:98:DF:62:CE:28:BD:44
+tls_starttls on
+from bandali@gnu.org
+user bandali
+passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+
+# gnu (old)
+account gnu-aminb : gnu
+from aminb@gnu.org
+account gnu-amin : gnu
+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
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
+# csclub
+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
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
+# Set a default account
+account default : amin

diff --git a/.msmtprc b/.msmtprc
deleted file mode 100644 (file)
index b04d471..0000000
--- a/.msmtprc
+++ /dev/null
@@ -1,59 +0,0 @@
-# Set default values for all following accounts.
-defaults
-port 587
-tls on
-auth on
-#tls_trust_file /etc/ssl/certs/ca-certificates.crt
-logfile ~/.msmtp.log
-
-# amin
-account amin
-host mail.bndl.org
-# use `msmtp -a amin --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint 2A:78:50:28:E5:7E:DB:E4:E8:98:F1:A9:45:4E:97:41:F9:D7:78:CC:9B:84:04:B6:6A:9B:E1:C6:20:EE:0D:8B
-tls_starttls on
-from amin@bndl.org
-user amin@bndl.org
-passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
-
-account aminb : amin
-from amin@aminb.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 2B:CF:6A:F6:B5:9A:49:BC:40:61:2F:00:A8:E2:4B:75:D7:EB:18:94:09:68:6B:90:80:98:DF:62:CE:28:BD:44
-tls_starttls on
-from bandali@gnu.org
-user bandali
-passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
-
-# gnu (old)
-account gnu-aminb : gnu
-from aminb@gnu.org
-account gnu-amin : gnu
-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
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-
-# csclub
-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
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-
-# Set a default account
-account default : amin