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

ref #31346

debian/control

@@ -0,0 +1,54 @@
+Source: eole-lemonldap-ng
+Section: web
+Priority: optional
+Maintainer: Équipe EOLE <eole@ac-dijon.fr>
+Build-Depends: debhelper-compat (= 12)
+Standards-Version: 4.5.0
+Homepage: https://dev-eole.ac-dijon.fr/projects/sso
+Vcs-Git: https://dev-eole.ac-dijon.fr/git/eole-lemonldap-ng.git
+Vcs-Browser: https://dev-eole.ac-dijon.fr/projects/sso/repository
+
+Package: eole-lemonldap-ng
+Architecture: all
+Depends: eole-lemonldap-ng-pkg,
+         ${misc:Depends}
+Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG
+ Pour toute information complémentaire, veuillez vous rendre sur le
+ site du projet EOLE.
+
+Package: eole-lemonldap-ng-scribe
+Architecture: all
+Depends: eole-scribe,
+         eole-lemonldap-ng,
+	 libapache2-mod-perl2,
+         ${misc:Depends}
+Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur le
+ site du projet EOLE.
+
+Package: eole-lemonldap-ng-pkg
+Architecture: all
+Section: metapackages
+Depends: lemonldap-ng,
+         lemonldap-ng-doc,
+         lemonldap-ng-fastcgi-server,
+         lemonldap-ng-handler,
+         liblemonldap-ng-handler-perl,
+         liblemonldap-ng-manager-perl,
+         liblemonldap-ng-portal-perl,
+         libauthen-captcha-perl,
+         libauthen-sasl-perl,
+         libemail-sender-perl,
+         libgd-securityimage-perl,
+         libimage-magick-perl,
+         libio-string-perl,
+         liblasso-perl,
+         libnet-ldap-perl,
+         libunicode-string-perl,
+         libmime-tools-perl,
+         libnet-openid-server-perl,
+         ${misc:Depends}
+Description: Paquet de dépendances pour eole-lemonldap.
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/copyright

@@ -0,0 +1,37 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: eole-lemonldap-ng
+Source: http://dev-eole.ac-dijon.fr/projects/sso
+
+Files: *
+Copyright: 2020 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-C
+
+License: CeCILL-C
+ This software is governed by the CeCILL-C license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-C
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-C license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-C License can be found
+ in `/usr/share/common-licenses/CeCILL-2'.

debian/eole-lemonldap-ng-scribe.install

@@ -0,0 +1,2 @@
+usr/share/eole/creole/dicos/71_lemonldap_ng_scribe.xml
+usr/share/eole/postservice/98-lemonldap-ng-scribe-register-hosts

debian/eole-lemonldap-ng.install

@@ -0,0 +1,6 @@
+usr/share/creole/
+usr/share/eole/creole/dicos/70_lemonldap_ng.xml
+usr/share/eole/creole/distrib/
+usr/share/eole/diagnose/
+usr/share/eole/postservice/99-lemonldap-ng
+usr/share/eole/posttemplate/

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/eole/%(version)s

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/70_lemonldap_ng.xml

@@ -99,6 +99,12 @@
             <variable name='llChangePassword' type='oui/non' description="Permettre aux utilisateurs de changer leurs mots de passe depuis LemonLDAP">
                 <value>oui</value>
             </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">
                 <value>oui</value>
             </variable>
@@ -158,6 +164,12 @@
             <slave>casLDAPAttribute</slave>
         </group>
 
+        <condition name='disabled_if_not_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'>
             <param>non</param>
             <target type='filelist'>lemonldap</target>

tmpl/lmConf-1.json

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