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

Fix generation of lmConf-1.json (#2254)

This commit is contained in:
Maxime Besson 2020-07-15 22:30:39 +02:00
parent 2054799baf
commit ea134d0bfc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_example/conf/lmConf-1.json
View File

@ -115,7 +115,7 @@
"localSessionStorage" : "Cache::FileCache",
"localSessionStorageOptions" : {
"cache_depth" : 3,
"cache_root" : "/tmp",
"cache_root" : "__CACHEDIR__",
"default_expires_in" : 600,
"directory_umask" : "007",
"namespace" : "lemonldap-ng-sessions"

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
View File

@ -433,7 +433,7 @@ sub buildZeroConf {
open( F, '>', $self->firstLmConfFile ) or die($!);
my $tmp = Lemonldap::NG::Manager::Conf::Zero::zeroConf(
'__DNSDOMAIN__', '__SESSIONDIR__',
'__PSESSIONDIR__', '__NOTIFICATIONDIR__'
'__PSESSIONDIR__', '__NOTIFICATIONDIR__', '__CACHEDIR__'
);
$tmp->{cfgNum} = 1;
print F $jsonEnc->encode($tmp);

5
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
View File

@ -3,11 +3,12 @@ package Lemonldap::NG::Manager::Conf::Zero;
our $VERSION = '2.0.8';
sub zeroConf {
my ( $domain, $sessionDir, $persistentSessionDir, $notificationDir ) = @_;
my ( $domain, $sessionDir, $persistentSessionDir, $notificationDir, $cacheDir ) = @_;
$domain ||= 'example.com';
$sessionDir ||= '/var/lib/lemonldap-ng/sessions';
$persistentSessionDir ||= '/var/lib/lemonldap-ng/psessions';
$notificationDir ||= '/var/lib/lemonldap-ng/notifications';
$cacheDir ||= '/var/cache/lemonldap-ng/';
return {
'timeout' => 72000,
'loginHistoryEnabled' => 1,
@ -187,7 +188,7 @@ sub zeroConf {
'namespace' => 'lemonldap-ng-sessions',
'default_expires_in' => 600,
'directory_umask' => '007',
'cache_root' => '/tmp',
'cache_root' => "$cacheDir",
'cache_depth' => 3,
},
};