diff --git a/abra.sh b/abra.sh index 02f711b..8c56201 100755 --- a/abra.sh +++ b/abra.sh @@ -14,3 +14,9 @@ migrate() { environment python manage.py migrate --noinput } + +trigger_wopi() { + environment + python manage.py trigger_wopi_configuration +} + diff --git a/compose.yml b/compose.yml index 2f1456b..aa5e237 100644 --- a/compose.yml +++ b/compose.yml @@ -51,6 +51,8 @@ x-common-env: &common-env LOGOUT_REDIRECT_URL: OIDC_REDIRECT_ALLOWED_HOSTS: OIDC_AUTH_REQUEST_EXTRA_PARAMS: + # REDIS + REDIS_URL: redis://${STACK_NAME}_redis:6379/0 # AI (Fixme: remove?) AI_FEATURE_ENABLED: "false" AI_BASE_URL: https://openaiendpoint.com @@ -62,8 +64,9 @@ 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: "http://onlyoffice/hosting/discovery" - WOPI_SRC_BASE_URL: "http://backend:8000" + WOPI_ONLYOFFICE_DISCOVERY_URL: "https://onlyoffice.lasuite-drive.cctest.autonomic.zone/hosting/discovery" +# WOPI_SRC_BASE_URL: "http://backend:8000" + WOPI_SRC_BASE_URL: "https://${DOMAIN}" x-postgres-env: &postgres-env # Postgresql db container configuration @@ -262,11 +265,14 @@ services: # ports: # - "9980:9980" environment: - - extra_params=--o:ssl.enable=false +# - 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=backend:8000 +# - aliasgroup1=collabora.lasuite-drive.cctest.autonomic.zone +# - aliasgroup1=backend:8000 deploy: labels: - "traefik.enable=true" @@ -284,7 +290,6 @@ services: - "traefik.http.middlewares.${STACK_NAME}_collabora-cors.headers.addVaryHeader=true" - "traefik.http.routers.${STACK_NAME}_collabora.middlewares=${STACK_NAME}_collabora-cors" - onlyoffice: image: onlyoffice/documentserver-de:9.2 # healthcheck: @@ -298,9 +303,29 @@ services: USE_UNAUTHORIZED_STORAGE: "true" networks: - backend + - proxy configs: - source: onlyoffice_conf target: /etc/onlyoffice/documentserver/local-production-linux.json + deploy: + 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.entrypoints=web-secure" + - "traefik.http.routers.${STACK_NAME}_onlyoffice.tls=true" + - "traefik.http.routers.${STACK_NAME}_onlyoffice.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.http.services.${STACK_NAME}_onlyoffice.loadbalancer.server.port=80" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.accessControlAllowOriginList=https://${DOMAIN}" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.accessControlAllowMethods=GET,POST,PUT,DELETE,OPTIONS" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.accessControlAllowHeaders=*" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.accessControlExposeHeaders=ETag,Content-Length" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.accessControlMaxAge=600" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-cors.headers.addVaryHeader=true" + - "traefik.http.routers.${STACK_NAME}_onlyoffice.middlewares=${STACK_NAME}_onlyoffice-cors" + - "traefik.http.middlewares.${STACK_NAME}_onlyoffice-fwdproto.headers.customRequestHeaders.X-Forwarded-Proto=https" + - "traefik.http.routers.${STACK_NAME}_onlyoffice.middlewares=${STACK_NAME}_onlyoffice-fwdproto" + web: image: nginx:1.25 diff --git a/onlyoffice-config.json b/onlyoffice-config.json index 08e9383..924f54c 100644 --- a/onlyoffice-config.json +++ b/onlyoffice-config.json @@ -1,7 +1,7 @@ { "wopi": { "enable": true, - "host": "http://localhost:9981", + "host": "https://onlyoffice.lasuite-drive.cctest.autonomic.zone/", "pdfView": [], "pdfEdit": [], "forms": [],