diff --git a/defaults/main.yml b/defaults/main.yml index 0312924..87c04a5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,7 +7,7 @@ shinyproxy_as_docker_service: false shinyproxy_docker_privileged_user: true shinyproxy_major_ver: 3 shinyproxy_minor_ver: 1 -shinyproxy_patch_ver: 0 +shinyproxy_patch_ver: 1 shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}' shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar' shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}' @@ -54,6 +54,7 @@ shinyproxy_as_docker_service_name: 'shinyproxy' shinyproxy_as_docker_src_dir: /srv/{{ shinyproxy_as_docker_stack_name }}_service shinyproxy_docker_network: 'shinyproxy' shinyproxy_docker_swarm_behind_haproxy: true +shinyproxy_docker_swarm_behind_pep: false shinyproxy_docker_swarm_replicas: 1 shinyproxy_docker_mount_conf_file: false shinyproxy_docker_log_to_journal: true diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2 index 832e944..e808037 100644 --- a/templates/shinyproxy-docker-compose.yml.j2 +++ b/templates/shinyproxy-docker-compose.yml.j2 @@ -1,9 +1,11 @@ version: '3.8' networks: +{% if not shinyproxy_docker_swarm_behind_pep %} {% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %} haproxy-public: external: true +{% endif %} {% endif %} {{ shinyproxy_docker_network }}: @@ -60,9 +62,11 @@ services: {% endif %} networks: - {{ shinyproxy_docker_network }} +{% if not shinyproxy_docker_swarm_behind_pep %} {% if shinyproxy_container_backend == 'docker-swarm' and shinyproxy_docker_swarm_behind_haproxy %} - haproxy-public {% endif %} +{% endif %} {% if shinyproxy_container_backend == 'docker-swarm' %} deploy: mode: replicated