From 21da16484ef5530b9a17372185ee94854a161979 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 18 Feb 2017 01:54:45 +0100
Subject: Make mail from configurable through ${FROM} (issue #7)

---
 bin/porticron      | 5 +++--
 etc/porticron.conf | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/porticron b/bin/porticron
index 6153507..2a1da0c 100755
--- a/bin/porticron
+++ b/bin/porticron
@@ -121,6 +121,7 @@ PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)
 
 # defaults, second half
 : ${RCPT:=root@${FQDN}}
+: ${FROM:=root@${FQDN}}
 : ${SYNC_CMD:=/usr/bin/emerge --sync}
 : ${SYNC_OVERLAYS_CMD:=/bin/true}
 
@@ -162,7 +163,7 @@ ${GLSA_UPGRADES}
 "
 		cat <<EOF | send_mail
 To: ${RCPT}
-From: root@${FQDN}
+From: ${FROM}
 Subject: ${SUBJECT_WARN}
 Date: ${DATE}
 
@@ -241,7 +242,7 @@ fi
 
 cat <<EOF | send_mail
 To: ${RCPT}
-From: root@${FQDN}
+From: ${FROM}
 Subject: ${SUBJECT}
 Date: ${DATE}
 
diff --git a/etc/porticron.conf b/etc/porticron.conf
index 8ddfa75..33b770a 100644
--- a/etc/porticron.conf
+++ b/etc/porticron.conf
@@ -19,6 +19,9 @@ SYNC_OVERLAYS_CMD="/bin/true"
 # emerge upgrade options
 UPGRADE_OPTS="--deep --update"
 
+# sender of reports
+FROM="root@$(hostname --fqdn)"
+
 # recipient for reports
 RCPT=root@$(hostname -f)
 
-- 
cgit v1.2.3-65-gdbad