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

3.1.0 compatibility.

This commit is contained in:
Andrea Dell'Amico 2024-05-14 18:55:50 +02:00
parent 5eb1309668
commit 54c2d597a4
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -6,8 +6,8 @@ shinyproxy_install: true
shinyproxy_as_docker_service: false
shinyproxy_docker_privileged_user: true
shinyproxy_major_ver: 3
shinyproxy_minor_ver: 0
shinyproxy_patch_ver: 2
shinyproxy_minor_ver: 1
shinyproxy_patch_ver: 0
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 }}'
@ -36,6 +36,7 @@ shinyproxy_default_proxy_max_lifetime: 60
shinyproxy_undertow_loglevel: 'INFO'
shinyproxy_prometheus_port: 9090
shinyproxy_expose_prometheus: true
shinyproxy_prometheus_metrics_prefix: "shinyproxy_"
# 30 minutes
shinyproxy_server_session_timeout: 1800
shinyproxy_server_secure_cookies: 'true'

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

@ -45,6 +45,7 @@ proxy:
authentication: {{ shinyproxy_authentication }}
{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
usage-stats-url: micrometer
usage-stats-micrometer-prefix: {{ shinyproxy_prometheus_metrics_prefix }}
{% endif %}
admin-groups: {{ shinyproxy_admin_group }}
container-backend: {{ shinyproxy_container_backend }}
@ -53,6 +54,11 @@ proxy:
container-memory-request: {{ shinyproxy_docker_memory_request }}
container-memory-limit: {{ shinyproxy_docker_memory_limit }}
container-cpu-limit: {{ shinyproxy_docker_cpu_limit }}
{% if shinyproxy_container_backend == 'docker-swarm' %}
service-wait-time: {{ shinyproxy_container_wait_time }}
{% endif %}
image-pull-policy: {{ shinyproxy_docker_image_pull_policy }}
{% if not shinyproxy_as_docker_service %}
cert-path: {{ shinyproxy_docker_certs_dir }}
@ -85,16 +91,6 @@ proxy:
manager-dn: {{ shinyproxy_ldap_admin }}
manager-password: {{ shinyproxy_ldap_admin_pwd }}
{% endif %}
{% if shinyproxy_authentication == 'keycloak' %}
keycloak:
realm: {{ shinyproxy_keycloak_realm }}
auth-server-url: {{ shinyproxy_keycloak_url }}
resource: {{ shinyproxy_keycloak_resource }}
credentials-secret: {{ shinyproxy_keycloak_secret }}
ssl-required: {{ shinyproxy_keycloak_ssl_required }}
name-attribute: {{ shinyproxy_keycloak_name_attribute }}
use-resource-role-mappings: {{ shinyproxy_keycloak_role_mappings }}
{% endif %}
{% if shinyproxy_authentication == 'openid' %}
openid:
auth-url: {{ shinyproxy_oidc_auth_url }}
@ -174,7 +170,7 @@ proxy:
{% if shinyproxy_as_docker_service %}
{% 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 }}
{% else %}
@ -190,12 +186,18 @@ security:
basic:
enabled: {{ shinyproxy_basic_auth }}
{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('3.1.0', '<') %}
management:
metrics:
export:
prometheus:
enabled: true
{% elif shinyproxy_expose_prometheus and shinyproxy_version is version_compare('3.1.0', '>=') %}
management:
prometheus:
metrics:
export:
enabled: true
{% endif %}
{% if shinyproxy_version is version_compare('2.6.0', '>=') %}