Skip to content
Snippets Groups Projects
Commit 88ec3433 authored by Guillaume ROUSSE's avatar Guillaume ROUSSE
Browse files

use same configuration directives as the registry

parent cd5d3dba
No related branches found
No related tags found
No related merge requests found
...@@ -5,15 +5,9 @@ tokens_validity_period = 2 ...@@ -5,15 +5,9 @@ tokens_validity_period = 2
# Templates directory # Templates directory
templates_dir = @templatesdir@ templates_dir = @templatesdir@
# From field use by the account manager
notice_from = edugain-access-check.fqdn
# federation metadata local copy path # federation metadata local copy path
federation_metadata_file = @sysconfdir@/edugain-md.xml federation_metadata_file = @sysconfdir@/edugain-md.xml
# Path to sendmail executable
sendmail_path = /usr/sbin/sendmail
[app] [app]
version = open Beta 1 version = open Beta 1
url = https://my.fqdn/accountmanager url = https://my.fqdn/accountmanager
...@@ -23,6 +17,12 @@ support_email = support@my.fqdn ...@@ -23,6 +17,12 @@ support_email = support@my.fqdn
file = /opt/testidp/IdPAccountManager/log/manager.log file = /opt/testidp/IdPAccountManager/log/manager.log
level = info level = info
[notifier)
# path to sendmail executable
sendmail_path = /usr/sbin/sendmail
# from field use by the account manager
from = edugain-access-check.fqdn
[database] [database]
type = mysql type = mysql
host = localhost host = localhost
......
...@@ -414,10 +414,10 @@ sub req_complete_challenge { ...@@ -414,10 +414,10 @@ sub req_complete_challenge {
); );
} }
my $sender = $self->{configuration}->{_}->{notice_from}; my $sender = $self->{configuration}->{notifier}->{from};
my $recipient = $self->{in}->{email}; my $sendmail = $self->{configuration}->{notifier}->{sendmail_path} ||
my $sendmail = $self->{configuration}->{_}->{sendmail_path} ||
'/usr/sbin/sendmail'; '/usr/sbin/sendmail';
my $recipient = $self->{in}->{email};
open(my $handle, '|-', "$sendmail -f $sender $recipient") or do { open(my $handle, '|-', "$sendmail -f $sender $recipient") or do {
$self->{logger}->errorf("Unable to run sendmail executable: %s", $ERRNO); $self->{logger}->errorf("Unable to run sendmail executable: %s", $ERRNO);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment