From 02a2239005b9cc08fde4fb85be6375d862f12410 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 17 Nov 2020 12:22:56 +0100 Subject: [PATCH] The configuration directory is now a variable. --- defaults/main.yml | 1 + templates/shinyproxy-docker-compose.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 00a63fc..a05e7fb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,6 +12,7 @@ shinyproxy_app_name: shinyproxy.jar shinyproxy_user: shinyproxy shinyproxy_landing_page: '/' shinyproxy_install_dir: /opt/shinyproxy +shinyproxy_conf_dir: '{{ shinyproxy_install_dir }}' shinyproxy_log_dir: /var/log/shinyproxy shinyproxy_bind_address: 127.0.0.1 shinyproxy_http_port: 8080 diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2 index 3a01865..8e99688 100644 --- a/templates/shinyproxy-docker-compose.yml.j2 +++ b/templates/shinyproxy-docker-compose.yml.j2 @@ -9,7 +9,7 @@ networks: configs: shinyproxy_conf: - file: {{ shinyproxy_as_docker_src_dir }}/application.yml + file: {{ shinyproxy_conf_dir }}/application.yml services: shinyproxy: {% if shinyproxy_container_backend == 'docker' %}