Cadoles
/
eole-lemonldap
20
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Philippe Caseiro 2018-03-08 16:04:28 +01:00
parent e5ada4d3eb 6e6a6449a4
commit e2f656f9f8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dicos/70_lemonldap_ng.xml
View File

@ -28,6 +28,9 @@
<variable name='ldapBindUserDN' type='string' description="Utilisateur de connection à l'annuaire" mandatory="True"/> <variable name='ldapBindUserDN' type='string' description="Utilisateur de connection à l'annuaire" mandatory="True"/>
<variable name='ldapBindUserPassword' type='string' description="Mot de passe de l'utilisateur de connection à l'annuaire" mandatory="True"/> <variable name='ldapBindUserPassword' type='string' description="Mot de passe de l'utilisateur de connection à l'annuaire" mandatory="True"/>
<variable name="samlOrganizationName" type='string' description="Nom de l'organisation SAML" mode='expert'/> <variable name="samlOrganizationName" type='string' description="Nom de l'organisation SAML" mode='expert'/>
<variable name="lemonAdmin" type='string' description="LemonLDAP Administrator username" mode='expert'>
<value>admin</value>
</variable>
</family> </family>
<separators> <separators>
<separator name="managerWebName">Configuration DNS</separator> <separator name="managerWebName">Configuration DNS</separator>

2
tmpl/lmConf-1.js
View File

@ -210,7 +210,7 @@
"registerDB": "Demo", "registerDB": "Demo",
"locationRules": { "locationRules": {
"%%managerWebName": { "%%managerWebName": {
"default": "$uid eq \"dwho\"" "default": "$uid eq \"%%lemonAdmin\""
}, },
"test1.%%nom_domaine_local": { "test1.%%nom_domaine_local": {
"default": "accept", "default": "accept",