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

Hash default values in subDefaultConf, and do not initialize macros config key to get default values in Manager

Browse Source
This commit is contained in:
Clément Oudot 2010-08-16 14:05:27 +00:00
parent ae4fb60d8a
commit 9c5d2e648c
2 changed files with 12 additions and 17 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

@ -37,9 +37,6 @@ exportedHeaders
ldapBase
'__LDAPSUFFIX__'
macros
'$data1 = {};'
globalStorageOptions
'$data1 = {'Directory' => '__SESSIONDIR__'};'

26
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
View File

@ -1354,13 +1354,7 @@ sub defaultConf {
cda => '0',
cookieName => 'lemonldap',
domain => 'example.com',
exportedHeaders => { 'test.example.com' => { 'Auth-User' => '$uid' }, },
exportedVars => { cn => 'cn', mail => 'mail', uid => 'uid', },
globalStorage => 'Apache::Session::File',
globalStorageOptions => {
'Directory' => '/var/lib/lemonldap-ng/sessions/',
'LockDirectory' => '/var/lib/lemonldap-ng/sessions/lock/'
},
https => '0',
issuerDB => 'Null',
ldapBase => 'dc=example,dc=com',
@ -1369,17 +1363,10 @@ sub defaultConf {
ldapServer => 'localhost',
ldapTimeout => '120',
ldapVersion => '3',
locationRules => { 'test.example.com' => { default => 'accept' }, },
macros => {
'_whatToTrace' =>
'$_auth eq \'LDAP\' ? $uid : ($_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : "$_user\\@$_auth" )'
},
managerDn => '',
managerPassword => '',
notification => '0',
notificationStorage => 'File',
notificationStorageOptions =>
{ dirName => '/var/lib/lemonldap-ng/notifications', },
notifyDeleted => '1',
notifyOther => '1',
portal => $portal,
@ -1525,8 +1512,19 @@ sub defaultConf {
sub subDefaultConf {
return {
locationRules => { default => 'deny' },
exportedHeaders => { 'Auth-User' => '$uid' },
exportedVars => { cn => 'cn', mail => 'mail', uid => 'uid', },
globalStorageOptions => {
'Directory' => '/var/lib/lemonldap-ng/sessions/',
'LockDirectory' => '/var/lib/lemonldap-ng/sessions/lock/'
},
locationRules => { default => 'deny' },
macros => {
'_whatToTrace' =>
'$_auth eq \'LDAP\' ? $uid : ($_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : "$_user\\@$_auth" )'
},
notificationStorageOptions =>
{ dirName => '/var/lib/lemonldap-ng/notifications', },
remoteGlobalStorageOptions => {
'proxy' => 'https://remote/index.pl/sessions',
'ns' => 'https://remote/Lemonldap/NG/Common/CGI/SOAPService',