diff --git a/dicos/70_lemonldap_ng.xml b/dicos/70_lemonldap_ng.xml
index 30bea97..a54b0ed 100644
--- a/dicos/70_lemonldap_ng.xml
+++ b/dicos/70_lemonldap_ng.xml
@@ -7,6 +7,7 @@
+
@@ -51,11 +52,26 @@
non
+
+ bootstrap
+
+
+ non
+
+
+ oui
+
+
+ oui
+
+
+
Configuration DNS
Configuration LDAP
Configuration CAS
+ Personnalisation de la mire SSO
@@ -77,6 +93,9 @@
['ldaps','ldap']
+
+
+ ['LDAP','Demo','Custom']
casLDAPAttribute
@@ -88,6 +107,18 @@
LemonLDAP
saLemon
+
+ non
+ llRegisterDB
+
+
+ Custom
+ llRegisterURL
+
+
+ ['bootstrap','dark','impact','pastel']
+ False
+
Activer l'hébergement d'une place de marché HTTP pour OpenNebula
@@ -95,5 +126,6 @@
Nom DNS de service d'authentification de LemonLDAP::NG ex:auth.cadoles.com
DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)
server_names_hash_bucket_size Taille du hash des noms de serveur pour NGINX
+ Affiche une case à cocher sur la mire SSO qui permet a l'utilisateur de voir l'historique de connection de son compte avant d'être redirigé vers le service demandé
diff --git a/tmpl/lemonldap-ng.ini b/tmpl/lemonldap-ng.ini
index a1bb9f5..c41aba4 100644
--- a/tmpl/lemonldap-ng.ini
+++ b/tmpl/lemonldap-ng.ini
@@ -112,10 +112,14 @@ localStorageOptions={ \
; PORTAL CUSTOMIZATION
; Name of the skin
-;portalSkin = pastel
+portalSkin = %%llSkin
; Modules displayed
;portalDisplayLogout = 1
-;portalDisplayResetPassword = 1
+%if %%llResetPassword == "oui"
+portalDisplayResetPassword = 1
+%else
+portalDisplayResetPassword = 0
+%end if
;portalDisplayChangePassword = 1
;portalDisplayAppslist = 1
;portalDisplayLoginHistory = 1
diff --git a/tmpl/lmConf-1.js b/tmpl/lmConf-1.js
index a4371bd..26117a5 100644
--- a/tmpl/lmConf-1.js
+++ b/tmpl/lmConf-1.js
@@ -39,7 +39,9 @@
"%%managerWebName": {}
},
"vhostOptions": {
- "%%managerWebName": {},
+ "%%managerWebName": {
+ "vhostHttps" : "1"
+ },
"test1.%%nom_domaine_local": {},
"test2.%%nom_domaine_local": {}
},
@@ -195,7 +197,11 @@
"mailSubject": "[LemonLDAP::NG] Your new password",
"nginxCustomHandlers": {},
"samlSPSSODescriptorAuthnRequestsSigned": 1,
+%if %%llResetPassword == "oui"
"portalDisplayResetPassword": 1,
+%else
+ "portalDisplayResetPassword": 0,
+%end if
"openIdSreg_timezone": "_timezone",
"infoFormMethod": "get",
"openIdAuthnLevel": 1,
@@ -212,7 +218,11 @@
"slaveAuthnLevel": 2,
"samlIDPSSODescriptorSingleLogoutServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleLogout;#PORTAL#/saml/singleLogoutReturn",
"Soap": 1,
- "registerDB": "Demo",
+%if %%llRegisterDB == "Custom"
+ "registerDB": "Null",
+%else
+ "registerDB": "%%llRegisterDB",
+%end if
"locationRules": {
"%%managerWebName": {
"default": "$uid eq \"%%lemonAdmin\""
@@ -342,7 +352,11 @@
"activeTimer": 1,
"cda": 0,
"samlServicePublicKeySig": "",
+%if %%llCheckLogins == "oui"
"portalCheckLogins": 1,
+%else
+ "portalCheckLogins": 0,
+%end if
"CAS_authnLevel": 1,
"macros": {
"_whatToTrace": "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : \"$_user\""
@@ -388,7 +402,11 @@
"oidcOPMetaDataOptions": null,
"samlSPSSODescriptorWantAssertionsSigned": 1,
"samlOrganizationName": "%%samlOrganizationName",
+%if %%llRegisterDB == "Custom"
+ "registerUrl": "%%llRegisterURL",
+%else
"registerUrl": "https://%%authWebName/register.pl",
+%end if
"casAccessControlPolicy": "none",
"multiValuesSeparator": ";",
"ldapPort": %%ldapServerPort