diff --git a/roles/srv-web-proxy-domain/tasks/main.yml b/roles/srv-web-proxy-domain/tasks/main.yml index 472a70ec..5593c0a6 100644 --- a/roles/srv-web-proxy-domain/tasks/main.yml +++ b/roles/srv-web-proxy-domain/tasks/main.yml @@ -32,6 +32,5 @@ when: applications | is_feature_enabled('oauth2',application_id) - name: "include the web-app-oauth2-proxy role {{domain}}" - include_role: - name: web-app-oauth2-proxy + include_tasks: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/tasks/main.yml" when: applications | is_feature_enabled('oauth2',application_id) \ No newline at end of file diff --git a/roles/web-app-oauth2-proxy/tasks/main.yml b/roles/web-app-oauth2-proxy/tasks/main.yml index 15156e59..e380de08 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(oauth2_proxy_application_id)).directories.volumes}}" +- name: "Transfering oauth2-proxy-keycloak.cfg.j2 to {{(path_docker_compose_instances | get_docker_compose(application_id)).directories.volumes}}" template: - src: oauth2-proxy-keycloak.cfg.j2 - dest: "{{(path_docker_compose_instances | get_docker_compose(oauth2_proxy_application_id)).directories.volumes}}{{applications[application_id].configuration_file}}" + 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['oauth2-proxy'].configuration_file}}" notify: - docker compose up \ No newline at end of file