From 2e1f1cbc3096279b5198c90ce1a42a7899131657 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 9 Apr 2024 17:02:07 +0200 Subject: [PATCH] Reintroduce the handlers for the secret management. --- defaults/main.yml | 2 +- handlers/main.yml | 10 ++++++++++ tasks/shinyproxy_docker_stack_service.yml | 17 +++-------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d9a8963..9fd1efa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,7 +4,7 @@ # https://github.com/openanalytics/shinyproxy-config-examples shinyproxy_install: true shinyproxy_as_docker_service: false -shinyproxy_docker_privileged_user: false +shinyproxy_docker_privileged_user: true shinyproxy_major_ver: 3 shinyproxy_minor_ver: 0 shinyproxy_patch_ver: 2 diff --git a/handlers/main.yml b/handlers/main.yml index f5f458b..6a08b49 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,3 +3,13 @@ ansible.builtin.service: name: shinyproxy state: restarted +- name: Stop the shinyproxy service + community.docker.docker_swarm_service: + name: "{{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_as_docker_service_name }}" + state: absent + +- name: Create the secret for the application.yml file + community.docker.docker_secret: + name: "{{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_as_docker_service_name }}" + data_src: '{{ shinyproxy_as_docker_src_dir }}/application.yml' + state: present diff --git a/tasks/shinyproxy_docker_stack_service.yml b/tasks/shinyproxy_docker_stack_service.yml index ea8ae73..a7b341e 100644 --- a/tasks/shinyproxy_docker_stack_service.yml +++ b/tasks/shinyproxy_docker_stack_service.yml @@ -37,20 +37,9 @@ owner: root group: root mode: "0400" - register: shinyproxy_conf_file - - - name: shinyproxy_docker_stack_service | Stop the shinyproxy service {{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_as_docker_service_name }} # noqa: name[template] noqa: yaml[line-length] - community.docker.docker_swarm_service: - name: "{{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_as_docker_service_name }}" - state: absent - when: shinyproxy_conf_file is changed # noqa: no-handler - - - name: shinyproxy_docker_stack_service | Create the secret for the application.yml file - community.docker.docker_secret: - name: "{{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_as_docker_service_name }}" - data_src: '{{ shinyproxy_as_docker_src_dir }}/application.yml' - state: present - when: shinyproxy_conf_file is changed # noqa: no-handler + notify: + - Stop the shinyproxy service + - Create the secret for the application.yml file - name: shinyproxy_docker_stack_service | Start the shinyproxy stack community.docker.docker_stack: