summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2020-03-13 18:28:13 +0100
committerDaniel Friesel <daniel.friesel@uos.de>2020-03-13 18:28:13 +0100
commit871a44f15e7b59120fe04c033c2158785f5af216 (patch)
tree095528166a7ae42bac5ef73ac00e7becca55e545
parent901cfc50d8773c394d49c4b14d78f9caf93ba32a (diff)
Do not hardcode From mail address1.15.7
-rw-r--r--examples/travelynx.conf20
-rw-r--r--lib/Travelynx/Helper/Sendmail.pm2
2 files changed, 13 insertions, 9 deletions
diff --git a/examples/travelynx.conf b/examples/travelynx.conf
index fe3e960..851698c 100644
--- a/examples/travelynx.conf
+++ b/examples/travelynx.conf
@@ -22,14 +22,6 @@
password => die("Changeme!"),
},
- mail => {
- # If you want to disable outgoing mail for development purposes,
- # uncomment the following line. Mails will instead be logged as
- # Mojolicious "info" messages, causing their content to be printed on
- # stdout.
- ## disabled => 1,
- },
-
# See the Mojo::Server::Hypnotoad manual for details on the following
# settings.
hypnotoad => {
@@ -41,6 +33,18 @@
spare => 2,
},
+ mail => {
+ # If you want to disable outgoing mail for development purposes,
+ # uncomment the following line. Mails will instead be logged as
+ # Mojolicious "info" messages, causing their content to be printed on
+ # stdout.
+ ## disabled => 1,
+
+ # Otherwise, specify the sender ("From" field) for mail sent by travelynx
+ # here. E.g. 'Travelynx <mail@example.org>'
+ from => die("Changeme!"),
+ },
+
# Secrets used for cookie signing and verification. Must contain at least
# one random string. If you specify several strings, the first one will
# be used for signing new cookies, and the remaining ones will still be
diff --git a/lib/Travelynx/Helper/Sendmail.pm b/lib/Travelynx/Helper/Sendmail.pm
index fa3c4fd..73b08cd 100644
--- a/lib/Travelynx/Helper/Sendmail.pm
+++ b/lib/Travelynx/Helper/Sendmail.pm
@@ -21,7 +21,7 @@ sub custom {
my $reg_mail = Email::Simple->create(
header => [
To => $to,
- From => 'Travelynx <travelynx@finalrewind.org>',
+ From => $self->{config}{from},
Subject => $subject,
'Content-Type' => 'text/plain; charset=UTF-8',
],