ISTI-ansible-roles
/
ansible-role-shinyproxy
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move some configuration options.

This commit is contained in:
Andrea Dell'Amico 2024-04-09 14:52:42 +02:00
parent a98e9f2971
commit df94a67fd2
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
templates/shinyproxy-conf.yml.j2
View File

@ -14,8 +14,6 @@ server:
proxy: proxy:
{% if shinyproxy_container_backend == 'docker-swarm' %} {% if shinyproxy_container_backend == 'docker-swarm' %}
bind-address: 0.0.0.0 bind-address: 0.0.0.0
docker:
internal-networking: true
{% else %} {% else %}
bind-address: {{ shinyproxy_bind_address }} bind-address: {{ shinyproxy_bind_address }}
{% endif %} {% endif %}
@ -45,6 +43,24 @@ proxy:
{% endif %} {% endif %}
admin-groups: {{ shinyproxy_admin_group }} admin-groups: {{ shinyproxy_admin_group }}
container-backend: {{ shinyproxy_container_backend }} 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' %} {% if shinyproxy_authentication == 'ldap' %}
# LDAP configuration # LDAP configuration
ldap: ldap:
@ -89,22 +105,6 @@ proxy:
{% endif %} {% 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: specs:
{% if shinyproxy_default_apps %} {% if shinyproxy_default_apps %}
- id: 01_hello - id: 01_hello