diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index d5f6e08053..1dc65c7072 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -25,6 +25,9 @@ hosts: os_control_stg[0]:os_control[0] user: root gather_facts: false + vars: + elections_oidc_overwrite_redirect_uri: >- + https://elections{{ env_suffix }}.fedoraproject.org/oidc_callback vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/roles/openshift-apps/elections/templates/client_secrets.json b/roles/openshift-apps/elections/templates/client_secrets.json index be2a86c259..9c2a6eb91e 100644 --- a/roles/openshift-apps/elections/templates/client_secrets.json +++ b/roles/openshift-apps/elections/templates/client_secrets.json @@ -8,8 +8,8 @@ "client_secret": "{{ elections_oidc_client_secret }}", {% endif %} "issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/", - "redirect_uris": [ - "https://elections{{env_suffix}}.fedoraproject.org/oidc_callback" + "redirect_uris": ["{{ elections_oidc_overwrite_redirect_uri }}"], + ], "token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", "userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo" diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg index 4134d8e8d5..560efdfab3 100644 --- a/roles/openshift-apps/elections/templates/fedora-elections.cfg +++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg @@ -21,6 +21,7 @@ FEDORA_ELECTIONS_ADMIN_GROUP = 'elections' OIDC_CLIENT_SECRETS = '/opt/app-root/secret/client_secrets.json' +OIDC_OVERWRITE_REDIRECT_URI = '{{ elections_oidc_overwrite_redirect_uri }}' ## Fedora-elections can integrate with FAS to retrieve information about the ## candidates, the following configuration keys are required for this