From 57201fb2ecdbf3e4deac3544dbed34bd6e9de767 Mon Sep 17 00:00:00 2001 From: notplants Date: Thu, 8 Jan 2026 16:33:46 -0500 Subject: [PATCH] working on readme and configs --- .env.sample | 2 ++ compose.yml | 20 +++++++------------ ...config.json => onlyoffice-config.json.tmpl | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) rename onlyoffice-config.json => onlyoffice-config.json.tmpl (81%) diff --git a/.env.sample b/.env.sample index b620ff4..b7023fc 100644 --- a/.env.sample +++ b/.env.sample @@ -2,6 +2,8 @@ TYPE=lasuite-drive DOMAIN=lasuite-drive.example.com MINIO_DOMAIN="minio.${DOMAIN}" +COLLABORA_DOMAIN="collabora.${DOMAIN}" +ONLY_OFFICE_DOMAIN="onlyoffice.${DOMAIN}" ## Domain aliases #EXTRA_DOMAINS=', `www.lasuite-docs.example.com`' diff --git a/compose.yml b/compose.yml index aa5e237..81a78c4 100644 --- a/compose.yml +++ b/compose.yml @@ -63,9 +63,8 @@ x-common-env: &common-env # WOPI WOPI_CLIENTS: "collabora,onlyoffice" - WOPI_COLLABORA_DISCOVERY_URL: "https://collabora.lasuite-drive.cctest.autonomic.zone/hosting/discovery" - WOPI_ONLYOFFICE_DISCOVERY_URL: "https://onlyoffice.lasuite-drive.cctest.autonomic.zone/hosting/discovery" -# WOPI_SRC_BASE_URL: "http://backend:8000" + WOPI_COLLABORA_DISCOVERY_URL: "${COLLABORA_DOMAIN}/hosting/discovery" + WOPI_ONLYOFFICE_DISCOVERY_URL: "${ONLY_OFFICE_DOMAIN}/hosting/discovery" WOPI_SRC_BASE_URL: "https://${DOMAIN}" x-postgres-env: &postgres-env @@ -262,22 +261,16 @@ services: networks: - backend - proxy -# ports: -# - "9980:9980" environment: -# - extra_params=--o:ssl.enable=false - extra_params=--o:ssl.enable=false --o:ssl.termination=true -# - extra_params=--o:ssl.enable=true - username=drive - password=password - - server_name=collabora.lasuite-drive.cctest.autonomic.zone -# - aliasgroup1=collabora.lasuite-drive.cctest.autonomic.zone -# - aliasgroup1=backend:8000 + - server_name=${COLLABORA_DOMAIN} deploy: labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - - "traefik.http.routers.${STACK_NAME}_collabora.rule=Host(`collabora.lasuite-drive.cctest.autonomic.zone`)" + - "traefik.http.routers.${STACK_NAME}_collabora.rule=Host(`${COLLABORA_DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}_collabora.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_collabora.tls=true" - "traefik.http.routers.${STACK_NAME}_collabora.tls.certresolver=${LETS_ENCRYPT_ENV}" @@ -311,7 +304,7 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - - "traefik.http.routers.${STACK_NAME}_onlyoffice.rule=Host(`onlyoffice.lasuite-drive.cctest.autonomic.zone`)" + - "traefik.http.routers.${STACK_NAME}_onlyoffice.rule=Host(`${ONLY_OFFICE_DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}_onlyoffice.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_onlyoffice.tls=true" - "traefik.http.routers.${STACK_NAME}_onlyoffice.tls.certresolver=${LETS_ENCRYPT_ENV}" @@ -372,7 +365,8 @@ configs: file: abra-entrypoint.sh onlyoffice_conf: name: ${STACK_NAME}_onlyoffice_conf_${ONLYOFFICE_CONF_VERSION} - file: onlyoffice-config.json + file: onlyoffice-config.json.tmpl + template_driver: golang secrets: django_sk: diff --git a/onlyoffice-config.json b/onlyoffice-config.json.tmpl similarity index 81% rename from onlyoffice-config.json rename to onlyoffice-config.json.tmpl index 924f54c..0ac1726 100644 --- a/onlyoffice-config.json +++ b/onlyoffice-config.json.tmpl @@ -1,7 +1,7 @@ { "wopi": { "enable": true, - "host": "https://onlyoffice.lasuite-drive.cctest.autonomic.zone/", + "host": "https://${ONLY_OFFICE_DOMAIN}", "pdfView": [], "pdfEdit": [], "forms": [],