From be47b4330e8ed169e07b533f3e471e990e84b2ae Mon Sep 17 00:00:00 2001 From: cmsassot Date: Thu, 9 Feb 2023 19:25:00 +0100 Subject: [PATCH] Ajout variables hydra_oidc_base_url /hydra_oidc_hydra_url_error --- defaults/main.yml | 2 ++ templates/cadoles-pod-hydra-oidc-v1.conf.j2 | 4 ++-- templates/hydra-dispatcher-apps.yml.j2 | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e05b7a7..29c0fd4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -190,6 +190,8 @@ oidc_test_app_public_base_url: "{{ haproxy_public_base_url }}{{ haproxy_oidc_tes enable_hydra_oidc: no hydra_oidc_debug: no +hydra_oidc_hydra_url_error: +hydra_oidc_base_url: hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}" hydra_oidc_app_title: {} hydra_oidc_app_description: {} diff --git a/templates/cadoles-pod-hydra-oidc-v1.conf.j2 b/templates/cadoles-pod-hydra-oidc-v1.conf.j2 index fddb01b..dc9da13 100644 --- a/templates/cadoles-pod-hydra-oidc-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-oidc-v1.conf.j2 @@ -13,8 +13,8 @@ PODMAN_ARGS="\ -e 'OIDC_TOKEN_ENDPOINT={{ hydra_oidc_token_endpoint }}' \ -e 'OIDC_USERINFO_ENDPOINT={{ hydra_oidc_userinfo_endpoint }}' \ -e 'OIDC_LOGOUT_ENDPOINT={{ hydra_oidc_logout_endpoint }}' \ - -e 'BASE_URL={{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}' \ - -e 'REDIRECT_ON_ERROR_URL={{ hydra_urls_error }}' \ + -e 'BASE_URL={{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}' \ + -e 'REDIRECT_ON_ERROR_URL={{ hydra_oidc_hydra_url_error }}' \ -e 'OIDC_SCOPE={{ hydra_oidc_scope }}' \ -e 'CLIENT_ID={{ hydra_oidc_client_id }}' \ -e 'CLIENT_SECRET={{ hydra_oidc_client_secret }}' \ diff --git a/templates/hydra-dispatcher-apps.yml.j2 b/templates/hydra-dispatcher-apps.yml.j2 index 26d14d7..91a1360 100644 --- a/templates/hydra-dispatcher-apps.yml.j2 +++ b/templates/hydra-dispatcher-apps.yml.j2 @@ -21,9 +21,9 @@ hydra: description: fr: "{{ hydra_oidc_app_description.fr }}" en: "{{ hydra_oidc_app_description.en | default("{{ hydra_oidc_app_description.fr }}") }}" - login_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/login" - consent_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent" - logout_url: "{{ haproxy_public_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout" + login_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/login" + consent_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/consent" + logout_url: "{{ hydra_oidc_base_url }}{{ haproxy_hydra_oidc_base_path }}/logout" attributes_rewrite_rules: {{ hydra_oidc_attributes_rewrite_rules | to_json }} icon_url: "{{ hydra_oidc_app_icon_url }}" options: