kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-08-26 21:45:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deactivated redis, moved version to correct place for web-svc-collabora

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-08-20 03:40:37 +02:00
parent 6d70f78989
commit f477ee3731
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/web-svc-collabora/config/main.yml
View File

@ -5,7 +5,7 @@ server:
docker: docker:
services: services:
redis: redis:
enabled: true enabled: false
database: database:
enabled: false # May this is wrong. Just set during refactoring enabled: false # May this is wrong. Just set during refactoring
collabora: collabora:

8
roles/web-svc-collabora/templates/docker-compose.yml.j2
View File

@ -2,17 +2,11 @@
collabora: collabora:
{% include 'roles/docker-container/templates/base.yml.j2' %} {% include 'roles/docker-container/templates/base.yml.j2' %}
image: {{ COLLABORA_IMAGE }} image: "{{ COLLABORA_IMAGE }}:{{ COLLABORA_VERSION }}"
version: {{ COLLABORA_VERSION }}
container_name: {{ COLLABORA_CONTAINER }} container_name: {{ COLLABORA_CONTAINER }}
ports: ports:
- "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}" - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}"
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} {% 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-container/templates/networks.yml.j2' %}
{% include 'roles/docker-compose/templates/networks.yml.j2' %} {% include 'roles/docker-compose/templates/networks.yml.j2' %}

2
roles/web-svc-collabora/templates/nginx.conf.j2
View File

@ -12,7 +12,7 @@ server {
{% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %} {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %}
{# Optional explicit fast path for discovery #} {# 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' %} {% include 'roles/srv-proxy-7-4-core/templates/location/html.conf.j2' %}
{# WebSocket handling for Collabora #} {# WebSocket handling for Collabora #}