dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0' into 2564

Browse Source
This commit is contained in:
Christophe Maudoux 2021-08-02 10:10:25 +02:00
commit 084b9b26f1
14 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sources/admin/nosqlsessionbackend.rst
View File

@ -32,7 +32,7 @@ Name Comment Example
**sentinels** Redis sentinels list 127.0.0.1:26379,127.0.0.2:26379,127.0.0.3:26379
**service** Sentinel service name mymaster
**password** password (== requirepass) ChangeMe
**select** Redis DB 1
**database** Redis DB 1
**Index** Fields to index refer to :ref:`fieldstoindex`
============= =========================== ===============================================

16
doc/sources/admin/portalcustom.rst
View File

@ -113,11 +113,17 @@ To achieve this, you can create a rule in the Manager: select
``General Parameters`` > ``Portal`` > ``Customization`` >
``Skin display rules`` and click on "New entry". Then fill the two fields;
- **Rule**: a Perl expression (you can use %ENV hash to get environment
variables, or $_url to get URL called before redirection, or $ipAddr
to test user IP address). If the rule evaluation is true, the
corresponding skin is applied.
- **Skin**: name of the skin to use.
- **Key**: a Perl expression (you can use ``%ENV`` hash to get environment
variables, or ``$_url`` to get URL called before redirection, or ``$ipAddr``
to use user IP address). If the rule evaluation is true, the corresponding
skin is applied.
- **Value**: the name of the skin to use.
Example:
```
$_url =~ m#^http://test1.example.com#
```
Skin files
~~~~~~~~~~

3
lemonldap-ng-common/META.json
View File

@ -4,7 +4,7 @@
"Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
],
"dynamic_config" : 1,
"generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
"generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010",
"license" : [
"open_source"
],
@ -40,6 +40,7 @@
"Cookie::Baker::XS" : "0",
"Crypt::URandom" : "0",
"DBI" : "0",
"Date::Parse" : "0",
"LWP::Protocol::https" : "0",
"Net::LDAP" : "0",
"SOAP::Lite" : "0",

3
lemonldap-ng-common/META.yml
View File

@ -10,7 +10,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@ -26,6 +26,7 @@ recommends:
Cookie::Baker::XS: '0'
Crypt::URandom: '0'
DBI: '0'
Date::Parse: '0'
LWP::Protocol::https: '0'
Net::LDAP: '0'
SOAP::Lite: '0'

1
lemonldap-ng-common/Makefile.PL
View File

@ -47,6 +47,7 @@ WriteMakefile(
'Convert::Base32' => 0,
'Cookie::Baker::XS' => 0,
'Crypt::URandom' => 0,
'Date::Parse' => 0,
'String::Random' => 0,
'DBI' => 0,
'Net::LDAP' => 0,

2
lemonldap-ng-handler/META.json
View File

@ -4,7 +4,7 @@
"Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
],
"dynamic_config" : 1,
"generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
"generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010",
"license" : [
"open_source"
],

2
lemonldap-ng-handler/META.yml
View File

@ -13,7 +13,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html

3
lemonldap-ng-manager/META.json
View File

@ -4,7 +4,7 @@
"Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
],
"dynamic_config" : 1,
"generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
"generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010",
"license" : [
"open_source"
],
@ -22,6 +22,7 @@
"prereqs" : {
"build" : {
"requires" : {
"Email::Sender" : "0",
"IO::String" : "0",
"Regexp::Common" : "0",
"Test::Pod" : "1"

3
lemonldap-ng-manager/META.yml
View File

@ -3,13 +3,14 @@ abstract: 'Perl extension for managing Lemonldap::NG Web-SSO system.'
author:
- 'Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>'
build_requires:
Email::Sender: '0'
IO::String: '0'
Regexp::Common: '0'
Test::Pod: '1'
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html

1
lemonldap-ng-manager/Makefile.PL
View File

@ -8,6 +8,7 @@ WriteMakefile(
VERSION_FROM => 'lib/Lemonldap/NG/Manager.pm', # finds $VERSION
LICENSE => 'gpl',
BUILD_REQUIRES => {
'Email::Sender' => 0,
'IO::String' => 0,
'Regexp::Common' => 0,
'Test::Pod' => 1.00,

2
lemonldap-ng-manager/site/htdocs/static/languages/tr.json
View File

@ -786,7 +786,7 @@
"portalDisplayRefreshMyRights":"Görüntüleme hakları yenileme bağlantısı",
"portalDisplayRegister":"Yeni hesap kaydet",
"portalDisplayResetPassword":"Parolayı sıfırla",
"portalEnablePasswordDisplay":"Allow to display password",
"portalEnablePasswordDisplay":"Parolayı göstermeye izin ver",
"portalErrorOnExpiredSession":"Süresi dolmuş oturumda hatayı göster",
"portalErrorOnMailNotFound":"E-posta bulunamadığında hatayı göster",
"portalForceAuthn":"Kimlik doğrulamaya zorla",

2
lemonldap-ng-portal/META.json
View File

@ -4,7 +4,7 @@
"Xavier Guimard <x.guimard@free.fr>, Clément Oudot <clement@oodo.net>"
],
"dynamic_config" : 1,
"generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
"generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010",
"license" : [
"open_source"
],

2
lemonldap-ng-portal/META.yml
View File

@ -18,7 +18,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html

6
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm
View File

@ -8,7 +8,7 @@
# of lemonldap-ng.ini) and underlying handler configuration
package Lemonldap::NG::Portal::Main::Init;
our $VERSION = '2.0.12';
our $VERSION = '2.0.13';
package Lemonldap::NG::Portal::Main;
@ -531,13 +531,13 @@ sub findEP {
}
}
}
$self->logger->debug("Plugin $plugin initializated");
$self->logger->debug("Plugin $plugin initialized");
# Rules for menu
if ( $obj->can('spRules') ) {
foreach my $k ( keys %{ $obj->{spRules} } ) {
$self->logger->info(
"$k is defined more than one time, it can have some bad effect on Menu display"
"$k is defined more than one time, it can have some bad effects on Menu display"
) if ( $self->spRules->{$k} );
$self->spRules->{$k} = $obj->{spRules}->{$k};
}