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

Version 2.6.0. New config options.

This commit is contained in:
Andrea Dell'Amico 2022-01-06 19:24:07 +01:00
parent 47c4934841
commit fab98c012b
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
defaults/main.yml
View File

@ -3,13 +3,14 @@
shinyproxy_install: True shinyproxy_install: True
shinyproxy_as_docker_service: False shinyproxy_as_docker_service: False
shinyproxy_major_ver: 2 shinyproxy_major_ver: 2
shinyproxy_minor_ver: 5 shinyproxy_minor_ver: 6
shinyproxy_patch_ver: 0 shinyproxy_patch_ver: 0
shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}' shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}'
shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar' shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}' shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
shinyproxy_app_name: shinyproxy.jar shinyproxy_app_name: shinyproxy.jar
shinyproxy_user: shinyproxy shinyproxy_user: shinyproxy
shinyproxy_spring_name: "ShinyProxy"
shinyproxy_landing_page: '/' shinyproxy_landing_page: '/'
shinyproxy_install_dir: /opt/shinyproxy shinyproxy_install_dir: /opt/shinyproxy
shinyproxy_conf_dir: '{{ shinyproxy_install_dir }}' shinyproxy_conf_dir: '{{ shinyproxy_install_dir }}'
@ -19,6 +20,14 @@ shinyproxy_http_port: 8080
shinyproxy_docker_http_port_mode: 'ingress' shinyproxy_docker_http_port_mode: 'ingress'
shinyproxy_heartbeat_rate: 10000 shinyproxy_heartbeat_rate: 10000
shinyproxy_heartbeat_timeout: 60000 shinyproxy_heartbeat_timeout: 60000
# None, Confirm, Auto
shinyproxy_default_websocket_reconnection_mode: 'Auto'
shinyproxy_stop_proxies_on_shutdown: 'false'
shinyproxy_recover_running_proxies: 'true'
shinyproxy_recover_running_proxies_from_different_config: 'true'
shinyproxy_default_stop_proxy_on_logout: 'true'
# max lifetime, in minutes
shinyproxy_default_proxy_max_lifetime: 60
shinyproxy_undertow_loglevel: 'INFO' shinyproxy_undertow_loglevel: 'INFO'
shinyproxy_prometheus_port: 9090 shinyproxy_prometheus_port: 9090
shinyproxy_expose_prometheus: True shinyproxy_expose_prometheus: True

25
templates/shinyproxy-2-conf.yml.j2
View File

@ -14,6 +14,14 @@ proxy:
heartbeat-rate: {{ shinyproxy_heartbeat_rate }} heartbeat-rate: {{ shinyproxy_heartbeat_rate }}
heartbeat-timeout: {{ shinyproxy_heartbeat_timeout }} heartbeat-timeout: {{ shinyproxy_heartbeat_timeout }}
container-wait-time: {{ shinyproxy_container_wait_time }} container-wait-time: {{ shinyproxy_container_wait_time }}
{% if shinyproxy_version is version_compare('2.6.0', '>=') %}
default-webSocket-reconnection-mode: {{ shinyproxy_default_websocket_reconnection_mode }}
stop-proxies-on-shutdown: {{ shinyproxy_stop_proxies_on_shutdown }}
recover-running-proxies: {{ shinyproxy_recover_running_proxies }}
recover-running-proxies-from-different-config: {{ shinyproxy_recover_running_proxies_from_different_config }}
default-stop-proxy-on-logout: {{ shinyproxy_default_stop_proxy_on_logout }}
default-proxy-max-lifetime: {{ shinyproxy_default_proxy_max_lifetime }}
{% endif %}
{% if shinyproxy_container_backend == 'docker-swarm' %} {% if shinyproxy_container_backend == 'docker-swarm' %}
bind-address: 0.0.0.0 bind-address: 0.0.0.0
{% else %} {% else %}
@ -82,7 +90,14 @@ proxy:
container-cmd: ["R", "-e {{ app.cmd }}"] container-cmd: ["R", "-e {{ app.cmd }}"]
container-image: {{ app.docker_image }} container-image: {{ app.docker_image }}
container-memory: {{ app.docker_memory | default('2g') }} container-memory: {{ app.docker_memory | default('2g') }}
{% if shinyproxy_as_docker_service %} {% if shinyproxy_version is version_compare('2.6.0', '>=') %}
stop-on-logout: {{ app.stop_on_logout | default('true') }}
max-lifetime: {{ app.max-lifetime | default(shinyproxy_default_proxy_max_lifetime) }}
{% endif %}
{% if shinyproxy_as_docker_service %}
{% if shinyproxy_container_backend == 'docker-swarm' %} {% if shinyproxy_container_backend == 'docker-swarm' %}
container-network: {{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_docker_network }} container-network: {{ shinyproxy_as_docker_stack_name }}_{{ shinyproxy_docker_network }}
@ -113,7 +128,13 @@ management:
prometheus: prometheus:
enabled: true enabled: true
{% endif %} {% endif %}
{% if shinyproxy_version is version_compare('2.6.0', '>=') %}
spring:
application:
name: {{ shinyproxy_spring_name }}
{% endif %}
logging: logging:
file: {{ shinyproxy_log_dir }}/shinyproxy.log file: {{ shinyproxy_log_dir }}/shinyproxy.log
#max-size: {{ shinyproxy_max_log_size }} #max-size: {{ shinyproxy_max_log_size }}