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

Change default conf files since reload keys are now in manager

Browse Source
This commit is contained in:
François-Xavier Deltombe 2012-01-26 16:50:34 +00:00
parent bdfc006b8f
commit 8a024bd284
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/lemonldap-ng/_example/conf/lmConf-1
View File

@ -63,3 +63,6 @@ macros
whatToTrace
'$_whatToTrace'
reloadUrls
'$data1 = {'reload.__DNSDOMAIN__' => 'http://reload.__DNSDOMAIN__/reload'};'

4
modules/lemonldap-ng-common/lemonldap-ng.ini
View File

@ -238,5 +238,5 @@ useRedirectOnError = 1
[apply]
# URL used to reload configuration
reload.__DNSDOMAIN__ = http://reload.__DNSDOMAIN__/reload
# Configuration reload URLS defined in manager can be overridden here
;reload.__DNSDOMAIN__ = http://reload.__DNSDOMAIN__/reload

5
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm
View File

@ -801,8 +801,9 @@ sub applyConf {
# Get apply section values
my %reloadUrls =
%{ $self->confObj->getLocalConf( APPLYSECTION, undef, 0 ) }
|| %{ $self->confObj->getConf->{reloadUrls} };
%{ $self->confObj->getLocalConf( APPLYSECTION, undef, 0 ) };
%reloadUrls = %{ $self->confObj->getConf->{reloadUrls} }
unless ( defined %reloadUrls );
# Create user agent
my $ua = new LWP::UserAgent( requests_redirectable => [] );

4
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
View File

@ -279,7 +279,7 @@ sub en {
radiusServer => 'Server hostname',
randomPasswordRegexp => 'Regexp for password generation',
redirection => 'Handler redirections',
reloadUrls => 'reload configuration URLs',
reloadUrls => 'Configuration reload',
remoteCookieName => 'Cookie name',
remoteGlobalStorage => 'Sessions module',
remoteGlobalStorageOptions => 'Sessions module options',
@ -729,7 +729,7 @@ sub fr {
randomPasswordRegexp =>
'Expression regulière pour la génération des mots de passe',
redirection => 'Redirections du Handler',
reloadUrls => 'URLs de rechargement de la configuration',
reloadUrls => 'Mise à jour de la configuration',
remoteCookieName => 'Nom du cookie',
remoteGlobalStorage => 'Module des sessions',
remoteGlobalStorageOptions => 'Options du module des sessions',