From 5e13c78a01af6d0520885f42fa974d603661d5ad Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Tue, 7 Nov 2017 16:59:08 +0100
Subject: [PATCH] shorter configuration directive name
---
bin/account-manager.pl.in | 8 ++++----
conf/manager.conf.in | 2 +-
lib/IdPAccountManager/WebRequest.pm | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index 3a0a6e4..b4b8e0f 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -140,7 +140,7 @@ sub list_accounts {
die "failed to update simpleSAMLphp configuration file\n"
unless IdPAccountManager::Tools::update_ssp_authsources(
$configuration->{templates_dir},
- $configuration
+ $configuration->{idp_accounts_file}}
);
printf "Update simpleSamlPhp configuration file...\n";
@@ -153,7 +153,7 @@ sub parse_metadata {
eval {
$federation_metadata = IdPAccountManager::SAMLMetadata->new(
- file => $configuration->{federation_metadata_file_path}
+ file => $configuration->{federation_metadata_file}
);
};
die "unable to load federation metadata: $EVAL_ERROR" if $EVAL_ERROR;
@@ -161,7 +161,7 @@ sub parse_metadata {
my $data = $federation_metadata->parse(id => $options{sp_entityid});
printf "Document %s parsed\n",
- $configuration->{federation_metadata_file_path};
+ $configuration->{federation_metadata_file};
## List SAML entities
printf "Hashref representing the metadata:\n";
@@ -401,7 +401,7 @@ Remove all expired test accounts from DB.
$> account-manager-client.pl parse_metadata
Parses the SAML metadata file, as defined by the
-C<federation_metadata_file_path> configuration parameter.
+C<federation_metadata_file> configuration parameter.
$> account-manager-client.pl list_tokens \
--sp_entityid https://test.federation.renater.fr/test/ressource \
diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 2c1f32e..54e69cb 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -66,7 +66,7 @@ dev_sp_contact = john@my.fqdn, sarah@my.fqdn
notice_from = edugain-access-check.fqdn
# federation metadata local copy path
-federation_metadata_file_path = @sysconfdir@/edugain-md.xml
+federation_metadata_file = @sysconfdir@/edugain-md.xml
# Valid account profiles
account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 67170f3..06d3b15 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -185,7 +185,7 @@ sub req_account_wizard {
eval {
$metadata = IdPAccountManager::SAMLMetadata->new(
- file => $self->{configuration}->{federation_metadata_file_path}
+ file => $self->{configuration}->{federation_metadata_file}
);
};
if ($EVAL_ERROR) {
@@ -226,7 +226,7 @@ sub req_select_sp {
eval {
$metadata = IdPAccountManager::SAMLMetadata->new(
- file => $self->{configuration}->{federation_metadata_file_path}
+ file => $self->{configuration}->{federation_metadata_file}
);
};
if ($EVAL_ERROR) {
--
GitLab