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

This commit is contained in:
Philippe Caseiro 2018-03-09 12:01:42 +01:00
commit 658013c177
1 changed files with 10 additions and 10 deletions

View File

@ -72,7 +72,7 @@
"options": { "options": {
"name": "Application Test 2", "name": "Application Test 2",
"logo": "thumbnail.png", "logo": "thumbnail.png",
"uri": "http://test2.%%nom_domaine_local/", "uri": "https://test2.%%nom_domaine_local/",
"display": "auto", "display": "auto",
"description": "The same simple application displaying authenticated user" "description": "The same simple application displaying authenticated user"
}, },
@ -84,7 +84,7 @@
"type": "application", "type": "application",
"options": { "options": {
"description": "A simple application displaying authenticated user", "description": "A simple application displaying authenticated user",
"uri": "http://test1.%%nom_domaine_local/", "uri": "https://test1.%%nom_domaine_local/",
"logo": "demo.png", "logo": "demo.png",
"display": "auto", "display": "auto",
"name": "Application Test 1" "name": "Application Test 1"
@ -143,7 +143,7 @@
"logo": "help.png", "logo": "help.png",
"description": "Documentation supplied with LemonLDAP::NG", "description": "Documentation supplied with LemonLDAP::NG",
"display": "on", "display": "on",
"uri": "http://%%managerWebName/doc/", "uri": "https://%%managerWebName/doc/",
"name": "Local documentation" "name": "Local documentation"
}, },
"type": "application" "type": "application"
@ -200,7 +200,7 @@
"grantSessionRules": {}, "grantSessionRules": {},
"remoteGlobalStorage": "Lemonldap::NG::Common::Apache::Session::SOAP", "remoteGlobalStorage": "Lemonldap::NG::Common::Apache::Session::SOAP",
"reloadUrls": { "reloadUrls": {
"%%reloadWebName": "http://%%reloadWebName/reload" "%%reloadWebName": "https://%%reloadWebName/reload"
}, },
"registerTimeout": 0, "registerTimeout": 0,
"samlIDPSSODescriptorSingleSignOnServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleSignOn;", "samlIDPSSODescriptorSingleSignOnServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleSignOn;",
@ -247,8 +247,8 @@
"mailOnPasswordChange": 0, "mailOnPasswordChange": 0,
"captchaStorage": "Apache::Session::File", "captchaStorage": "Apache::Session::File",
"remoteGlobalStorageOptions": { "remoteGlobalStorageOptions": {
"proxy": "http://%%authWebName/index.pl/sessions", "proxy": "https://%%authWebName/index.pl/sessions",
"ns": "http://%%authWebName/Lemonldap/NG/Common/CGI/SOAPService" "ns": "https://%%authWebName/Lemonldap/NG/Common/CGI/SOAPService"
}, },
"passwordDB": "LDAP", "passwordDB": "LDAP",
"captcha_size": 6, "captcha_size": 6,
@ -319,7 +319,7 @@
"oidcOPMetaDataJSON": null, "oidcOPMetaDataJSON": null,
"samlIdPResolveCookie": "lemonldapidp", "samlIdPResolveCookie": "lemonldapidp",
"samlRelayStateTimeout": 600, "samlRelayStateTimeout": 600,
"samlOrganizationURL": "http://www.%%nom_domaine_local", "samlOrganizationURL": "https://auth.%%nom_domaine_local",
"globalStorageOptions": { "globalStorageOptions": {
"Directory": "/var/lib/lemonldap-ng/sessions", "Directory": "/var/lib/lemonldap-ng/sessions",
"LockDirectory": "/var/lib/lemonldap-ng/sessions/lock" "LockDirectory": "/var/lib/lemonldap-ng/sessions/lock"
@ -345,7 +345,7 @@
"oidcOPMetaDataJWKS": null, "oidcOPMetaDataJWKS": null,
"webIDAuthnLevel": 1, "webIDAuthnLevel": 1,
"issuerDBOpenIDActivation": "1", "issuerDBOpenIDActivation": "1",
"mailUrl": "http://%%authWebName/mail.pl", "mailUrl": "https://%%authWebName/mail.pl",
"maintenance": 0, "maintenance": 0,
"jsRedirect": 0, "jsRedirect": 0,
"cfgAuthor": "dwho", "cfgAuthor": "dwho",
@ -360,7 +360,7 @@
"ldapChangePasswordAsUser": 0, "ldapChangePasswordAsUser": 0,
"CAS_proxiedServices": {}, "CAS_proxiedServices": {},
"key": "e\"bTCt3*eU9^\\V%b", "key": "e\"bTCt3*eU9^\\V%b",
"portal": "http://%%authWebName/", "portal": "https://%%authWebName/",
"singleSessionUserByIP": 0, "singleSessionUserByIP": 0,
"portalOpenLinkInNewWindow": 0, "portalOpenLinkInNewWindow": 0,
"post": { "post": {
@ -379,7 +379,7 @@
"oidcOPMetaDataOptions": null, "oidcOPMetaDataOptions": null,
"samlSPSSODescriptorWantAssertionsSigned": 1, "samlSPSSODescriptorWantAssertionsSigned": 1,
"samlOrganizationName": "%%samlOrganizationName", "samlOrganizationName": "%%samlOrganizationName",
"registerUrl": "http://%%authWebName/register.pl", "registerUrl": "https://%%authWebName/register.pl",
"casAccessControlPolicy": "none", "casAccessControlPolicy": "none",
"multiValuesSeparator": ";", "multiValuesSeparator": ";",
"ldapPort": %%ldapServerPort "ldapPort": %%ldapServerPort