From f477ee373184de56d5f55402e381f6c09c15fc83 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 20 Aug 2025 03:40:37 +0200 Subject: [PATCH] Deactivated redis, moved version to correct place for web-svc-collabora --- roles/web-svc-collabora/config/main.yml | 2 +- roles/web-svc-collabora/templates/docker-compose.yml.j2 | 8 +------- roles/web-svc-collabora/templates/nginx.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/roles/web-svc-collabora/config/main.yml b/roles/web-svc-collabora/config/main.yml index 58d3c6a0..430f2382 100644 --- a/roles/web-svc-collabora/config/main.yml +++ b/roles/web-svc-collabora/config/main.yml @@ -5,7 +5,7 @@ server: docker: services: redis: - enabled: true + enabled: false database: enabled: false # May this is wrong. Just set during refactoring collabora: diff --git a/roles/web-svc-collabora/templates/docker-compose.yml.j2 b/roles/web-svc-collabora/templates/docker-compose.yml.j2 index efffcea7..7e674c8f 100644 --- a/roles/web-svc-collabora/templates/docker-compose.yml.j2 +++ b/roles/web-svc-collabora/templates/docker-compose.yml.j2 @@ -2,17 +2,11 @@ collabora: {% include 'roles/docker-container/templates/base.yml.j2' %} - image: {{ COLLABORA_IMAGE }} - version: {{ COLLABORA_VERSION }} + image: "{{ COLLABORA_IMAGE }}:{{ COLLABORA_VERSION }}" container_name: {{ COLLABORA_CONTAINER }} ports: - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}" {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} - healthcheck: - test: ["CMD", "curl", "-f", "http://127.0.0.1:9980/hosting/discovery"] - interval: 30s - timeout: 10s - retries: 5 {% include 'roles/docker-container/templates/networks.yml.j2' %} {% include 'roles/docker-compose/templates/networks.yml.j2' %} diff --git a/roles/web-svc-collabora/templates/nginx.conf.j2 b/roles/web-svc-collabora/templates/nginx.conf.j2 index 70bae0c0..934982bf 100644 --- a/roles/web-svc-collabora/templates/nginx.conf.j2 +++ b/roles/web-svc-collabora/templates/nginx.conf.j2 @@ -12,7 +12,7 @@ server { {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %} {# Optional explicit fast path for discovery #} - {% set location = "= /hosting/discovery" %} + {% set location = "= " ~ container_healthcheck %} {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %} {# WebSocket handling for Collabora #}