Move some configuration options.
This commit is contained in:
parent
a98e9f2971
commit
df94a67fd2
|
@ -14,8 +14,6 @@ server:
|
|||
proxy:
|
||||
{% if shinyproxy_container_backend == 'docker-swarm' %}
|
||||
bind-address: 0.0.0.0
|
||||
docker:
|
||||
internal-networking: true
|
||||
{% else %}
|
||||
bind-address: {{ shinyproxy_bind_address }}
|
||||
{% endif %}
|
||||
|
@ -45,6 +43,24 @@ proxy:
|
|||
{% endif %}
|
||||
admin-groups: {{ shinyproxy_admin_group }}
|
||||
container-backend: {{ shinyproxy_container_backend }}
|
||||
{% if shinyproxy_container_backend == 'docker' or shinyproxy_container_backend == 'docker-swarm' %}
|
||||
docker:
|
||||
container-memory-request: {{ shinyproxy_docker_memory_request }}
|
||||
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
|
||||
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
|
||||
{% if not shinyproxy_as_docker_service %}
|
||||
cert-path: {{ shinyproxy_docker_certs_dir }}
|
||||
url: {{ shinyproxy_docker_url }}
|
||||
container-protocol: {{ shinyproxy_docker_protocol }}
|
||||
privileged: {{ shinyproxy_docker_privileged }}
|
||||
port-range-start: {{ shinyproxy_docker_port_range_start }}
|
||||
internal-networking: {{ shinyproxy_docker_internal_networking }}
|
||||
{% else %}
|
||||
privileged: {{ shinyproxy_docker_privileged }}
|
||||
internal-networking: true
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if shinyproxy_authentication == 'ldap' %}
|
||||
# LDAP configuration
|
||||
ldap:
|
||||
|
@ -89,22 +105,6 @@ proxy:
|
|||
|
||||
{% endif %}
|
||||
|
||||
{% if shinyproxy_container_backend == 'docker' or shinyproxy_container_backend == 'docker-swarm' %}
|
||||
docker:
|
||||
container-memory-request: {{ shinyproxy_docker_memory_request }}
|
||||
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
|
||||
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
|
||||
{% if not shinyproxy_as_docker_service %}
|
||||
cert-path: {{ shinyproxy_docker_certs_dir }}
|
||||
url: {{ shinyproxy_docker_url }}
|
||||
container-protocol: {{ shinyproxy_docker_protocol }}
|
||||
privileged: {{ shinyproxy_docker_privileged }}
|
||||
port-range-start: {{ shinyproxy_docker_port_range_start }}
|
||||
internal-networking: {{ shinyproxy_docker_internal_networking }}
|
||||
{% else %}
|
||||
internal-networking: true
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
specs:
|
||||
{% if shinyproxy_default_apps %}
|
||||
- id: 01_hello
|
||||
|
|
Loading…
Reference in New Issue