diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json index cc64d3074..d0a0b3b1c 100644 --- a/_example/conf/lmConf-1.json +++ b/_example/conf/lmConf-1.json @@ -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" diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm index 4735ec25d..8156ca1d6 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm @@ -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); diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm index 175db1ee6..7b80e66bb 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm @@ -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, }, };