tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shiniproxy: Install version 1.0. Introduce a memory limit for the shiny apps.

This commit is contained in:
Andrea Dell'Amico 2017-09-15 16:02:37 +02:00
parent 9308f7cdf0
commit cb8cc3f356
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shinyproxy/defaults/main.yml
View File

@ -1,6 +1,6 @@
--- ---
shinyproxy_install: False shinyproxy_install: False
shinyproxy_version: 0.9.3 shinyproxy_version: 1.0.0
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
@ -10,8 +10,10 @@ shinyproxy_http_port: 8080
# For logrotate. In days # For logrotate. In days
shinyproxy_log_retention: 10 shinyproxy_log_retention: 10
shinyproxy_default_apps: True shinyproxy_default_apps: True
shinyproxy_docker_url: 'http://localhost:2375/' shinyproxy_docker_url: 'http://localhost:2375'
shinyproxy_docker_port_range_start: 20000 shinyproxy_docker_port_range_start: 20000
shinyproxy_container_wait_time: 60000
shinyproxy_hide_navbar: 'false'
shinyproxy_app_title: 'Open Analytics Shiny Proxy' shinyproxy_app_title: 'Open Analytics Shiny Proxy'
shinyproxy_logo_url: 'http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png' shinyproxy_logo_url: 'http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png'

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

@ -5,7 +5,9 @@ shiny:
landing-page: / landing-page: /
heartbeat-rate: 10000 heartbeat-rate: 10000
heartbeat-timeout: 60000 heartbeat-timeout: 60000
container-wait-time: {{ shinyproxy_container_wait_time }}
port: {{ shinyproxy_http_port }} port: {{ shinyproxy_http_port }}
hide-navbar: {{ shinyproxy_hide_navbar }}
authentication: {{ shinyproxy_authentication }} authentication: {{ shinyproxy_authentication }}
admin-groups: {{ shinyproxy_admin_group }} admin-groups: {{ shinyproxy_admin_group }}
{% if shinyproxy_ldap_enabled %} {% if shinyproxy_ldap_enabled %}
@ -49,9 +51,11 @@ shiny:
description: {{ app.description }} description: {{ app.description }}
docker-cmd: ["R", "-e {{ app.cmd }}"] docker-cmd: ["R", "-e {{ app.cmd }}"]
docker-image: {{ app.docker_image }} docker-image: {{ app.docker_image }}
docker-memory: {{ app.docker_memory | default('2g') }}
{% if app.groups is defined %} {% if app.groups is defined %}
groups: {{ app.groups }} groups: {{ app.groups }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}