Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
66be6dc37e
|
@ -218,10 +218,11 @@
|
||||||
"slaveAuthnLevel": 2,
|
"slaveAuthnLevel": 2,
|
||||||
"samlIDPSSODescriptorSingleLogoutServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleLogout;#PORTAL#/saml/singleLogoutReturn",
|
"samlIDPSSODescriptorSingleLogoutServiceHTTPPost": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST;#PORTAL#/saml/singleLogout;#PORTAL#/saml/singleLogoutReturn",
|
||||||
"Soap": 1,
|
"Soap": 1,
|
||||||
%if %%llRegisterDB == "Custom"
|
%set %%RegisterDB=%%getVar('llRegisterDB', 'Demo')
|
||||||
|
%if %%RegisterDB == "Custom"
|
||||||
"registerDB": "Null",
|
"registerDB": "Null",
|
||||||
%else
|
%else
|
||||||
"registerDB": "%%llRegisterDB",
|
"registerDB": "%%RegisterDB",
|
||||||
%end if
|
%end if
|
||||||
"locationRules": {
|
"locationRules": {
|
||||||
"%%managerWebName": {
|
"%%managerWebName": {
|
||||||
|
@ -402,7 +403,7 @@
|
||||||
"oidcOPMetaDataOptions": null,
|
"oidcOPMetaDataOptions": null,
|
||||||
"samlSPSSODescriptorWantAssertionsSigned": 1,
|
"samlSPSSODescriptorWantAssertionsSigned": 1,
|
||||||
"samlOrganizationName": "%%samlOrganizationName",
|
"samlOrganizationName": "%%samlOrganizationName",
|
||||||
%if %%llRegisterDB == "Custom"
|
%if %%RegisterDB == "Custom"
|
||||||
"registerUrl": "%%llRegisterURL",
|
"registerUrl": "%%llRegisterURL",
|
||||||
%else
|
%else
|
||||||
"registerUrl": "https://%%authWebName/register.pl",
|
"registerUrl": "https://%%authWebName/register.pl",
|
||||||
|
|
Loading…
Reference in New Issue