From eff2e8d2f418702a7626d37a77679598533b086a Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Wed, 17 Feb 2021 20:15:51 +0100 Subject: [PATCH] lr62_portal_server now has its specific entry in vars --- defaults/main.yml | 11 ++++++----- templates/lr62_portal_client.json.j2 | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f8d6df8..6adf370 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,9 +1,10 @@ --- -env : "dev" -keycloak_server : "accounts.{{ env }}.d4science.org" +env : "prod" +keycloak_server : "accounts.d4science.org" keycloak_baseurl: "https://{{keycloak_server}}" -d4science_realm_name: "d4scienceee" +d4science_realm_name: "d4science" d4science_realm_url: "{{ keycloak_baseurl }}/auth/admin/realms/{{ d4science_realm_name }}" d4science_realm_theme: "d4science" -ldap_server: "ldap.pre.d4science.org" -orchestrator_baseUrl: "https://orchestrator.d4science.org/api/workflow/" +lr62_portal_server: "services.d4science.org" +ldap_server: "directory.d4science.org" +orchestrator_baseUrl: "https://conductor.d4science.org/api/workflow/" diff --git a/templates/lr62_portal_client.json.j2 b/templates/lr62_portal_client.json.j2 index fc86bb8..1e33d1f 100644 --- a/templates/lr62_portal_client.json.j2 +++ b/templates/lr62_portal_client.json.j2 @@ -1,5 +1,5 @@ { - "baseUrl" : "https://{{env}}.d4science.org/", + "baseUrl" : "https://{{ lr62_portal_server }}/", "bearerOnly" : false, "clientId" : "lr62_portal", "name" : "lr62_portal", @@ -10,7 +10,7 @@ "enabled" : true, "protocol" : "openid-connect", "publicClient" : false, - "redirectUris" : ["https://{{env}}.d4science.org/"], + "redirectUris" : ["https://{{ lr62_portal_server }}/"], "protocolMappers": [ { "name": "send-groups-in-token",