From c0b06f98948074e470c115e3fd95f26f0f0047a4 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 2 Mar 2018 15:31:31 +0100
Subject: [PATCH] move accounts_file from idp to setup section
---
conf/manager.conf.in | 7 +++----
lib/AccountManager/App.pm | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index f611a61..a90cc13 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -10,11 +10,11 @@ support_email = support@my.fqdn
[setup]
# templates directory
templates_dir = @templatesdir@
-# federation metadata local copy path
-federation_metadata_file = @sysconfdir@/edugain-md.xml
+federation_metadata_file = /var/lib/access-check/edugain.xml
+accounts_file = /var/lib/access-check/accounts.php
[logger]
-file = /opt/testidp/IdPAccountManager/log/manager.log
+file = /var/log/access-check/manager.log
level = info
[mailer]
@@ -34,7 +34,6 @@ password = secret
scope = my.fqdn
entityid = https://my.fqdn/simplesaml/saml2/idp/metadata.php
displayname = eduGAIN Access Check
-accounts_file = @sysconfdir@/accounts.php
# default parameters for all services
[service]
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 950aed7..1020ace 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -638,7 +638,7 @@ sub req_create_accounts {
eval {
AccountManager::Tools::update_ssp_authsources(
$self->{configuration}->{setup}->{templates_dir},
- $self->{configuration}->{idp}->{accounts_file},
+ $self->{configuration}->{setup}->{accounts_file},
$accounts
);
};
--
GitLab