From fd637c58e33bc5d3652d8ad896b1f2f406bf042e Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 17 Jul 2025 05:49:45 +0200 Subject: [PATCH] Solved oauth2 path bugs --- roles/web-app-oauth2-proxy/tasks/main.yml | 2 +- roles/web-app-oauth2-proxy/templates/container.yml.j2 | 2 +- tasks/utils/update-repository-with-files.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/web-app-oauth2-proxy/tasks/main.yml b/roles/web-app-oauth2-proxy/tasks/main.yml index 8a516cd2..90bb2b44 100644 --- a/roles/web-app-oauth2-proxy/tasks/main.yml +++ b/roles/web-app-oauth2-proxy/tasks/main.yml @@ -1,6 +1,6 @@ - name: "Transfering oauth2-proxy-keycloak.cfg.j2 to {{(path_docker_compose_instances | get_docker_compose(application_id)).directories.volumes}}" template: src: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/templates/oauth2-proxy-keycloak.cfg.j2" - dest: "{{(path_docker_compose_instances | get_docker_compose(application_id)).directories.volumes}}{{applications | get_app_conf('oauth2-proxy' 'configuration_file')}}" + dest: "{{(path_docker_compose_instances | get_docker_compose(application_id)).directories.volumes}}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}" notify: - docker compose up \ No newline at end of file diff --git a/roles/web-app-oauth2-proxy/templates/container.yml.j2 b/roles/web-app-oauth2-proxy/templates/container.yml.j2 index 4fc4f11d..0be2c768 100644 --- a/roles/web-app-oauth2-proxy/templates/container.yml.j2 +++ b/roles/web-app-oauth2-proxy/templates/container.yml.j2 @@ -7,5 +7,5 @@ ports: - {{ports.localhost.oauth2_proxy[application_id]}}:4180/tcp volumes: - - "{{docker_compose.directories.volumes}}{{applications | get_app_conf('oauth2-proxy' 'configuration_file')}}:/oauth2-proxy.cfg" + - "{{docker_compose.directories.volumes}}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg" {% endif %} \ No newline at end of file diff --git a/tasks/utils/update-repository-with-files.yml b/tasks/utils/update-repository-with-files.yml index aaa7c6d7..2fec1af6 100644 --- a/tasks/utils/update-repository-with-files.yml +++ b/tasks/utils/update-repository-with-files.yml @@ -2,9 +2,9 @@ # Better load the repositories into /opt/docker/[servicename]/services, build them there and then use a docker-compose file for customizing # @todo Refactor\Remove # @deprecated -- name: "Merge detached_files with applications | get_app_conf('oauth2-proxy' 'configuration_file')" +- name: "Merge detached_files with applications | get_app_conf('oauth2-proxy','configuration_file')" set_fact: - merged_detached_files: "{{ detached_files + [applications | get_app_conf('oauth2-proxy' 'configuration_file')] }}" + merged_detached_files: "{{ detached_files + [applications | get_app_conf('oauth2-proxy','configuration_file')] }}" when: "{{ applications | get_app_conf(application_id,'features.oauth2')" - name: "backup detached files"