aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-06-15 02:13:44 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-06-15 02:13:44 +1200
commit0ae36a331c015f0b7d8dc56a94ec4a37ec519fce (patch)
tree699f05db4e31aba9a07e16852c2bf13314a8f12a
parentMerge branch 'hotfix/v9.22.1' (diff)
parentBump VERSION (diff)
downloaddotfiles-0ae36a331c015f0b7d8dc56a94ec4a37ec519fce.tar.gz
dotfiles-0ae36a331c015f0b7d8dc56a94ec4a37ec519fce.zip
Merge branch 'release/v9.23.0'v9.23.0
* release/v9.23.0: Set use_envelope_from in muttrc Remove SENDMAIL switching from Makefile
-rw-r--r--Makefile2
-rw-r--r--VERSION4
-rw-r--r--git/config.mi51
-rw-r--r--mutt/muttrc6
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5fb6664b..60f2be62 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,6 @@ XDG_DATA_HOME = $(HOME)/.local/share
NAME = 'Tom Ryder'
EMAIL = tom@sanctum.geek.nz
GPG_KEYID = FA09C06E1B670CD0B2F5DE60C14286EA77BB8872
-SENDMAIL = /usr/bin/msmtp
BINS = bin/ap \
bin/apf \
@@ -342,7 +341,6 @@ git/config: git/config.m4
-D NAME=$(NAME) \
-D EMAIL=$(EMAIL) \
-D GPG_KEYID=$(GPG_KEYID) \
- -D SENDMAIL=$(SENDMAIL) \
-D XDG_CONFIG_HOME=$(XDG_CONFIG_HOME) \
git/config.m4 > $@
diff --git a/VERSION b/VERSION
index 781dff90..3689486d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.22.1
-Thu, 11 Jun 2020 12:39:30 +0000
+tejr dotfiles v9.23.0
+Sun, 14 Jun 2020 14:13:41 +0000
diff --git a/git/config.mi5 b/git/config.mi5
index 3337a683..304be811 100644
--- a/git/config.mi5
+++ b/git/config.mi5
@@ -26,7 +26,6 @@
[sendemail]
confirm = compose
- smtpServer = <% SENDMAIL %>
[status]
short = true
diff --git a/mutt/muttrc b/mutt/muttrc
index 55c2a059..80165f3c 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -130,6 +130,12 @@ set strict_threads
set text_flowed
set reflow_wrap = 0
+# When passing mail to the sendmail binary, use the "From" address I set as the
+# envelope sender, in case the local mailserver needs to do any switching or
+# filtering based on that.
+#
+set use_envelope_from
+
# Don't wait for me to press a key after running a command if it exited
# successfully; this still warns me if something failed, though.
#