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

This commit is contained in:
Philippe Caseiro 2020-12-11 15:46:53 +01:00
commit ecfbc63a38
2 changed files with 16 additions and 2 deletions

View File

@ -99,6 +99,12 @@
<variable name='llChangePassword' type='oui/non' description="Permettre aux utilisateurs de changer leurs mots de passe depuis LemonLDAP"> <variable name='llChangePassword' type='oui/non' description="Permettre aux utilisateurs de changer leurs mots de passe depuis LemonLDAP">
<value>oui</value> <value>oui</value>
</variable> </variable>
<variable name='llADPasswordMaxAge' type='number' description="Durée de vie des mots de passe (en secondes)" mode='expert'>
<value>5184000</value>
</variable>
<variable name='llADPasswordExpireWarn' type='number' description="Délai avant affichage d'un message d'alerte sur l'expiration du mot de passe (en secondes)">
<value>3456000</value>
</variable>
<variable name='llResetExpiredPassword' type='oui/non' description="Autoriser le renouvellement des mots de passe expirés"> <variable name='llResetExpiredPassword' type='oui/non' description="Autoriser le renouvellement des mots de passe expirés">
<value>oui</value> <value>oui</value>
</variable> </variable>
@ -158,6 +164,12 @@
<slave>casLDAPAttribute</slave> <slave>casLDAPAttribute</slave>
</group> </group>
<condition name='enabled_if_in' source='lemon_user_db'>
<param>AD</param>
<target type='variable'>llADPasswordMaxAge</target>
<target type='variable'>llADPasswordExpireWarn</target>
</condition>
<condition name='disabled_if_in' source='activerLemon'> <condition name='disabled_if_in' source='activerLemon'>
<param>non</param> <param>non</param>
<target type='filelist'>lemonldap</target> <target type='filelist'>lemonldap</target>

View File

@ -13,8 +13,10 @@
%silent %%exported_vars.sort() %silent %%exported_vars.sort()
%silent %%cas_attributes.sort() %silent %%cas_attributes.sort()
{ {
"ADPwdExpireWarning": 0, %if %%lemon_user_db == "AD"
"ADPwdMaxAge": 0, "ADPwdExpireWarning": %%llADPasswordExpireWarn,
"ADPwdMaxAge": %%llADPasswordMaxAge,
%end if
"CAS_authnLevel": 1, "CAS_authnLevel": 1,
"CAS_pgtFile": "/tmp/pgt.txt", "CAS_pgtFile": "/tmp/pgt.txt",
"CAS_proxiedServices": {}, "CAS_proxiedServices": {},