diff --git a/roles/openshift-apps/waiverdb/templates/client_secrets.json b/roles/openshift-apps/waiverdb/templates/client_secrets.json deleted file mode 100644 index b106baf60d..0000000000 --- a/roles/openshift-apps/waiverdb/templates/client_secrets.json +++ /dev/null @@ -1,25 +0,0 @@ -{% if env == 'staging' %} -{"web": { - "issuer": "https://id.stg.fedoraproject.org/openidc/", - "redirect_uris": ["https://waiverdb.stg.fedoraproject.org/oidc_callback"], - "token_uri": "https://id.stg.fedoraproject.org/openidc/Token", - "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization", - "client_id": "waiverdb-stg", - "client_secret": "{{stg_waiverdb_oidc_secret}}", - "userinfo_uri": "https://id.stg.fedoraproject.org/openidc/UserInfo", - "token_introspection_uri": "https://id.stg.fedoraproject.org/openidc/TokenInfo" - } -} -{% else %} -{"web": { - "issuer": "https://id.fedoraproject.org/openidc/", - "redirect_uris": ["https://waiverdb.fedoraproject.org/oidc_callback"], - "token_uri": "https://id.fedoraproject.org/openidc/Token", - "auth_uri": "https://id.fedoraproject.org/openidc/Authorization", - "client_id": "waiverdb", - "client_secret": "{{prod_waiverdb_oidc_secret}}", - "userinfo_uri": "https://id.fedoraproject.org/openidc/UserInfo", - "token_introspection_uri": "https://id.fedoraproject.org/openidc/TokenInfo" - } -} -{% endif %} diff --git a/roles/openshift-apps/waiverdb/templates/secret.yml b/roles/openshift-apps/waiverdb/templates/secret.yml index 82d39ed0b4..8ac04a0896 100644 --- a/roles/openshift-apps/waiverdb/templates/secret.yml +++ b/roles/openshift-apps/waiverdb/templates/secret.yml @@ -14,7 +14,8 @@ stringData: {% endif %} client_secrets.json: |- {"web": { - "redirect_uris": ["https://waiverdb-waiverdb.apps.ocp{{env_suffix}}fedoraproject.org/"], + "issuer": "https://id{{ env_suffix }}.fedoraproject.org/openidc/", + "redirect_uris": ["https://waiverdb{{ env_suffix }}.fedoraproject.org/oidc_callback"], "token_uri": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Token", "auth_uri": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Authorization", {% if env == 'staging' %}