polishing

abra.sh

@@ -2,7 +2,7 @@
 # Docs: https://docs.coopcloud.tech/maintainers/handbook/#manage-configs
 export ABRA_ENTRYPOINT_VERSION=v5
 export NGINX_CONF_VERSION=v6
-export ONLYOFFICE_CONF_VERSION=v1
+export ONLYOFFICE_CONF_VERSION=v2
 export PG_BACKUP_VERSION=v3
 
 environment() {

compose.yml

@@ -32,7 +32,7 @@ x-common-env: &common-env
   # Media
   STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
   AWS_S3_ENDPOINT_URL: http://minio:9000
-  AWS_S3_DOMAIN_REPLACE: https://minio.lasuite-drive.cctest.autonomic.zone
+  AWS_S3_DOMAIN_REPLACE: https://${MINIO_DOMAIN}
   # AWS_S3_ACCESS_KEY_ID supplied via secret (this is same MINIO_ROOT_USER)
   # AWS_S3_SECRET_ACCESS_KEY supplied via secret (this is same as MINIO_ROOT_PASSWORD)
   MEDIA_BASE_URL: https://${DOMAIN}
@@ -63,8 +63,8 @@ x-common-env: &common-env
 
   # WOPI
   WOPI_CLIENTS: "collabora,onlyoffice"
-  WOPI_COLLABORA_DISCOVERY_URL: "${COLLABORA_DOMAIN}/hosting/discovery"
-  WOPI_ONLYOFFICE_DISCOVERY_URL: "${ONLY_OFFICE_DOMAIN}/hosting/discovery"
+  WOPI_COLLABORA_DISCOVERY_URL: "https://${COLLABORA_DOMAIN}/hosting/discovery"
+  WOPI_ONLYOFFICE_DISCOVERY_URL: "https://${ONLY_OFFICE_DOMAIN}/hosting/discovery"
   WOPI_SRC_BASE_URL: "https://${DOMAIN}"
 
 x-postgres-env: &postgres-env
@@ -294,12 +294,14 @@ services:
     environment:
       TZ: "Europe/Berlin"
       USE_UNAUTHORIZED_STORAGE: "true"
+      ONLY_OFFICE_DOMAIN: ${ONLY_OFFICE_DOMAIN} # need to make variable available for golang template
     networks:
       - backend
       - proxy
     configs:
       - source: onlyoffice_conf
         target: /etc/onlyoffice/documentserver/local-production-linux.json
+
     deploy:
       labels:
         - "traefik.enable=true"

onlyoffice-config.json.tmpl

@@ -1,7 +1,7 @@
 {
     "wopi": {
         "enable": true,
-        "host": "https://${ONLY_OFFICE_DOMAIN}",
+        "host": "https://{{ env "ONLY_OFFICE_DOMAIN" }}",
         "pdfView": [],
 		"pdfEdit": [],
 		"forms": [],

todo.txt

@@ -1 +0,0 @@
-- should collabora and onlyoffice be part of the recipe ... or linked ?