emailauth: Added emailauth_sender config.
parent
c63d71bbf3
commit
32923e732b
|
@ -26,6 +26,12 @@ sub getsetup () {
|
|||
rebuild => 0,
|
||||
section => "auth",
|
||||
},
|
||||
emailauth_sender => {
|
||||
type => "string",
|
||||
description => "email address to send emailauth mails as (default: adminemail)",
|
||||
safe => 1,
|
||||
rebuild => 0,
|
||||
},
|
||||
}
|
||||
|
||||
sub email_setup ($$) {
|
||||
|
@ -80,10 +86,12 @@ sub email_auth ($$$$) {
|
|||
error($@) if $@;
|
||||
my $shorturl=$config{url};
|
||||
$shorturl=~s/^https?:\/\///i;
|
||||
my $emailauth_sender=$config{emailauth_sender};
|
||||
$emailauth_sender=$config{adminemail} unless defined $emailauth_sender;
|
||||
sendmail(
|
||||
To => $email,
|
||||
From => "$config{wikiname} admin <".
|
||||
(defined $config{adminemail} ? $config{adminemail} : "")
|
||||
(defined $emailauth_sender ? $emailauth_sender : "")
|
||||
.">",
|
||||
Subject => "$config{wikiname} login | $shorturl",
|
||||
Message => $template->output,
|
||||
|
|
|
@ -5,6 +5,9 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
|
|||
* img test: Bail gracefully when ImageMagick is not present.
|
||||
* meta: Fix [[!meta name=foo]] by closing the open quote.
|
||||
|
||||
[ Joey Hess ]
|
||||
* emailauth: Added emailauth_sender config.
|
||||
|
||||
-- Simon McVittie <smcv@debian.org> Mon, 15 Jun 2015 18:13:23 +0100
|
||||
|
||||
ikiwiki (3.20150614) unstable; urgency=medium
|
||||
|
|
Loading…
Reference in New Issue