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

replace root_manager_dir configuration directive with templates_dir

parent b65fd1df
No related branches found
No related tags found
No related merge requests found
...@@ -25,8 +25,8 @@ idp_displayname = eduGAIN Access Check ...@@ -25,8 +25,8 @@ idp_displayname = eduGAIN Access Check
# Root simpleSamlPhp directory # Root simpleSamlPhp directory
root_ssp_dir = /opt/testidp/simplesamlphp root_ssp_dir = /opt/testidp/simplesamlphp
# Root test account manager directory # Templates directory
root_manager_dir = /opt/testidp/IdPAccountManager templates_dir = templates
# Database type refers to a Perl Database Driver name # Database type refers to a Perl Database Driver name
# However only a subset of existing DBDs are supported by Rose::DB::Object: # However only a subset of existing DBDs are supported by Rose::DB::Object:
......
...@@ -77,11 +77,10 @@ sub generate_password { ...@@ -77,11 +77,10 @@ sub generate_password {
## Updates simpleSamlPhp authsources.php configuration file ## Updates simpleSamlPhp authsources.php configuration file
sub update_ssp_authsources { sub update_ssp_authsources {
my ($root_manager_dir, $conf) = @_; my ($templates_dir, $conf) = @_;
my $tt2 = Template->new({ my $tt2 = Template->new({
INCLUDE_PATH => $root_manager_dir . ':' . INCLUDE_PATH => $templates_dir
$root_manager_dir . '/templates/accountProfiles'
}); });
my %args = ( my %args = (
accounts => IdPAccountManager::TestAccount::Data::Manager->get_testaccounts(), accounts => IdPAccountManager::TestAccount::Data::Manager->get_testaccounts(),
......
...@@ -168,9 +168,7 @@ sub respond { ...@@ -168,9 +168,7 @@ sub respond {
escape_quotes => escape_quotes =>
[ \&IdPAccountManager::Tools::escape_quotes, 0 ] [ \&IdPAccountManager::Tools::escape_quotes, 0 ]
}, },
INCLUDE_PATH => $self->{configuration}->{root_manager_dir} . ':' INCLUDE_PATH => $self->{configuration}->{templates_dir}
. $self->{configuration}->{root_manager_dir}
. '/templates/accountProfiles',
} }
); );
...@@ -581,7 +579,7 @@ sub req_validate_token { ...@@ -581,7 +579,7 @@ sub req_validate_token {
## Update simpleSAMLphp configuration to enable test accounts ## Update simpleSAMLphp configuration to enable test accounts
unless (IdPAccountManager::Tools::update_ssp_authsources( unless (IdPAccountManager::Tools::update_ssp_authsources(
$self->{configuration}->{root_manager_dir}, $self->{configuration}->{templates_dir},
$self->{configuration} $self->{configuration}
)) { )) {
push @{ $self->{out}->{errors} }, "accounts_creation_failed"; push @{ $self->{out}->{errors} }, "accounts_creation_failed";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment