From fdab397cce5d60c15a18657f90c458c93aab0853 Mon Sep 17 00:00:00 2001 From: Kyattsukuro Date: Sat, 10 Oct 2026 02:41:30 +0200 Subject: [PATCH] fixing collabora --- templates/compose.yml.j2 | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/templates/compose.yml.j2 b/templates/compose.yml.j2 index 1ed3d87..0f1009d 100644 --- a/templates/compose.yml.j2 +++ b/templates/compose.yml.j2 @@ -69,35 +69,36 @@ services: collabora: image: collabora/code:25.04.8.1.1 hostname: collabora + restart: unless-stopped networks: - proxy + environment: - - aliasgroup1="https://{{ nextcloud.url }}" - - DONT_GEN_SSL_CERT=YES - - domain="{{ nextcloud.collabora.url }}" - - VIRTUAL_HOST="{{ nextcloud.collabora.url }}" - - username=someAdmin - - password="{{ nextcloud.collabora.password }}" - - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.wopi.host=nextcloud.urmel.de --o:logging.disable_server_audit=true + aliasgroup1: "{{ nextcloud.url | replace('.', '\\\\.') }}" + username: admin + password: "{{ nextcloud.collabora.password }}" + DONT_GEN_SSL_CERT: "true" + extra_params: >- + --o:ssl.enable=false + --o:ssl.termination=true + --o:server_name={{ nextcloud.collabora.url }} + cap_add: - - CHOWN - - DAC_OVERRIDE - - FOWNER - MKNOD - - SETFCAP - - SETGID - - SETUID - - SYS_CHROOT - - SYS_ADMIN - entrypoint: ['/bin/bash', '-c'] - command: ['coolconfig generate-proof-key && /start-collabora-online.sh'] + healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:9980/hosting/discovery" ] + test: + - CMD + - curl + - -f + - http://localhost:9980/hosting/discovery interval: 15s timeout: 10s retries: 5 + start_period: 30s + labels: - traefik.enable: true + traefik.enable: "true" traefik.http.routers.collabora.rule: "Host(`{{ nextcloud.collabora.url }}`)" traefik.http.routers.collabora.tls: true traefik.http.routers.collabora.tls.certResolver: hetzner