diff --git a/defaults/main.yml b/defaults/main.yml index e615f09..46bf3f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,6 +24,7 @@ shinyproxy_as_docker_src_dir: /srv/shinyproxy_service shinyproxy_as_docker_service_name: 'shinyproxy' shinyproxy_docker_network: 'shinyproxy' shinyproxy_docker_swarm_replicas: 2 +shinyproxy_docker_log_to_journal: True # Shinyproxy configuration # docker, docker-swarm, kubernetes shinyproxy_container_backend: 'docker' diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2 index 40ade43..35104db 100644 --- a/templates/shinyproxy-docker-compose.yml.j2 +++ b/templates/shinyproxy-docker-compose.yml.j2 @@ -12,8 +12,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - {{ shinyproxy_as_docker_src_dir }}/application.yml:/opt/shinyproxy/application.yml:ro - networks: - - '{{ shinyproxy_docker_network }}' +# networks: +# - {{ shinyproxy_docker_network }} {% if shinyproxy_container_backend == 'docker-swarm' %} deploy: mode: replicated @@ -27,7 +27,7 @@ services: max_attempts: 3 window: 120s {% endif %} -{% if docker_log_to_journal %} +{% if shinyproxy_docker_log_to_journal %} logging: driver: 'journald' {% endif %}