LEMONLDAP::NG : Status has been broken by new storage.conf capability
This commit is contained in:
parent
2449e92c2d
commit
b96cad7a18
|
@ -1,13 +1,19 @@
|
||||||
lemonldap-ng (0.9.3) unstable; urgency=low
|
lemonldap-ng (0.9.3) unstable; urgency=low
|
||||||
|
|
||||||
[ Clement Oudot ]
|
[ Clement Oudot ]
|
||||||
* New menu and skin (pastel)
|
* New menu and skin (pastel). Menu calculates rights before displaying URL
|
||||||
|
|
||||||
[ Xavier Guimard ]
|
[ Xavier Guimard ]
|
||||||
* Authentication and UserDB separation
|
* Authentication and UserDB separation
|
||||||
* New session explorer system
|
* New session explorer system
|
||||||
|
* Backport of debian storage.conf file to normal installation
|
||||||
|
* Errors are now displayed in the browser for portal and manager
|
||||||
|
* Custom functions for rules, macros, headers and groups
|
||||||
|
* Manager protection
|
||||||
|
* New configuration access with local cache system
|
||||||
|
* AuthBasic handler
|
||||||
|
|
||||||
-- Xavier Guimard <x.guimard@free.fr> Tue, 11 Nov 2008 16:23:19 +0100
|
-- Xavier Guimard <x.guimard@free.fr> Wed, 24 Dec 2008 10:13:58 +0100
|
||||||
|
|
||||||
lemonldap-ng (0.9.2.2) unstable; urgency=low
|
lemonldap-ng (0.9.2.2) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -43,12 +43,6 @@ BEGIN {
|
||||||
sub init($$) {
|
sub init($$) {
|
||||||
my ( $class, $args ) = @_;
|
my ( $class, $args ) = @_;
|
||||||
$reloadTime = $args->{reloadTime} || 600;
|
$reloadTime = $args->{reloadTime} || 600;
|
||||||
|
|
||||||
# localStorage can be declared in configStorage or at the root or both
|
|
||||||
foreach (qw(localStorage localStorageOptions)) {
|
|
||||||
$args->{$_} ||= $args->{configStorage}->{$_};
|
|
||||||
$args->{configStorage}->{$_} ||= $args->{$_};
|
|
||||||
}
|
|
||||||
$localConfig = $args;
|
$localConfig = $args;
|
||||||
$class->localInit($args);
|
$class->localInit($args);
|
||||||
}
|
}
|
||||||
|
@ -66,6 +60,12 @@ sub localInit {
|
||||||
my ( $class, $args ) = @_;
|
my ( $class, $args ) = @_;
|
||||||
die("$class : unable to build configuration : $Lemonldap::NG::Common::Conf::msg")
|
die("$class : unable to build configuration : $Lemonldap::NG::Common::Conf::msg")
|
||||||
unless($lmConf = Lemonldap::NG::Common::Conf->new( $args->{configStorage} ));
|
unless($lmConf = Lemonldap::NG::Common::Conf->new( $args->{configStorage} ));
|
||||||
|
|
||||||
|
# localStorage can be declared in configStorage or at the root or both
|
||||||
|
foreach (qw(localStorage localStorageOptions)) {
|
||||||
|
$args->{$_} ||= $args->{configStorage}->{$_} || $lmConf->{$_};
|
||||||
|
$args->{configStorage}->{$_} ||= $args->{$_};
|
||||||
|
}
|
||||||
$class->defaultValuesInit($args);
|
$class->defaultValuesInit($args);
|
||||||
$class->SUPER::localInit($args);
|
$class->SUPER::localInit($args);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue