From 094b5ee3ebeffcb8fb981dec03325ec0c2f86394 Mon Sep 17 00:00:00 2001 From: Alex Ackermann Date: Thu, 8 May 2025 11:10:56 +0200 Subject: [PATCH] chore: remove OO from full deployment example --- .../config/onlyoffice/entrypoint-override.sh | 7 -- .../config/onlyoffice/local.json | 71 --------------- .../opencloud_full/config/opencloud/csp.yaml | 2 - .../examples/opencloud_full/onlyoffice.yml | 86 ------------------- .../examples/opencloud_full/opencloud.yml | 1 - 5 files changed, 167 deletions(-) delete mode 100755 deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh delete mode 100755 deployments/examples/opencloud_full/config/onlyoffice/local.json delete mode 100644 deployments/examples/opencloud_full/onlyoffice.yml diff --git a/deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh b/deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh deleted file mode 100755 index 60179dfe8e..0000000000 --- a/deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -# we can't mount it directly because the run-document-server.sh script wants to move it -cp /etc/onlyoffice/documentserver/local.dist.json /etc/onlyoffice/documentserver/local.json - -/app/ds/run-document-server.sh diff --git a/deployments/examples/opencloud_full/config/onlyoffice/local.json b/deployments/examples/opencloud_full/config/onlyoffice/local.json deleted file mode 100755 index 0db571fad4..0000000000 --- a/deployments/examples/opencloud_full/config/onlyoffice/local.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "services": { - "CoAuthoring": { - "sql": { - "type": "postgres", - "dbHost": "localhost", - "dbPort": "5432", - "dbName": "onlyoffice", - "dbUser": "onlyoffice", - "dbPass": "onlyoffice" - }, - "token": { - "enable": { - "request": { - "inbox": true, - "outbox": true - }, - "browser": true - }, - "inbox": { - "header": "Authorization" - }, - "outbox": { - "header": "Authorization" - } - }, - "secret": { - "inbox": { - "string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" - }, - "outbox": { - "string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" - }, - "session": { - "string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" - } - } - } - }, - "rabbitmq": { - "url": "amqp://guest:guest@localhost" - }, - "FileConverter": { - "converter": { - "inputLimits": [ - { - "type": "docx;dotx;docm;dotm", - "zip": { - "uncompressed": "1GB", - "template": "*.xml" - } - }, - { - "type": "xlsx;xltx;xlsm;xltm", - "zip": { - "uncompressed": "1GB", - "template": "*.xml" - } - }, - { - "type": "pptx;ppsx;potx;pptm;ppsm;potm", - "zip": { - "uncompressed": "1GB", - "template": "*.xml" - } - } - ] - } - } - -} diff --git a/deployments/examples/opencloud_full/config/opencloud/csp.yaml b/deployments/examples/opencloud_full/config/opencloud/csp.yaml index ba41bdf913..66cb8a05dd 100644 --- a/deployments/examples/opencloud_full/config/opencloud/csp.yaml +++ b/deployments/examples/opencloud_full/config/opencloud/csp.yaml @@ -19,7 +19,6 @@ directives: - 'blob:' - 'https://embed.diagrams.net/' # In contrary to bash and docker the default is given after the | character - - 'https://${ONLYOFFICE_DOMAIN|onlyoffice.opencloud.test}/' - 'https://${COLLABORA_DOMAIN|collabora.opencloud.test}/' # This is needed for the external-sites web extension when embedding sites - 'https://docs.opencloud.eu' @@ -29,7 +28,6 @@ directives: - 'blob:' - 'https://raw.githubusercontent.com/opencloud-eu/awesome-apps/' # In contrary to bash and docker the default is given after the | character - - 'https://${ONLYOFFICE_DOMAIN|onlyoffice.opencloud.test}/' - 'https://${COLLABORA_DOMAIN|collabora.opencloud.test}/' manifest-src: - '''self''' diff --git a/deployments/examples/opencloud_full/onlyoffice.yml b/deployments/examples/opencloud_full/onlyoffice.yml deleted file mode 100644 index dca81bae71..0000000000 --- a/deployments/examples/opencloud_full/onlyoffice.yml +++ /dev/null @@ -1,86 +0,0 @@ ---- -services: - traefik: - networks: - opencloud-net: - aliases: - - ${ONLYOFFICE_DOMAIN:-onlyoffice.opencloud.test} - - ${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.opencloud.test} - - collaboration-oo: - image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-latest} - networks: - opencloud-net: - depends_on: - opencloud: - condition: service_started - onlyoffice: - condition: service_healthy - entrypoint: - - /bin/sh - command: [ "-c", "opencloud collaboration server" ] - environment: - COLLABORATION_GRPC_ADDR: 0.0.0.0:9301 - COLLABORATION_HTTP_ADDR: 0.0.0.0:9300 - MICRO_REGISTRY: "nats-js-kv" - MICRO_REGISTRY_ADDRESS: "opencloud:9233" - COLLABORATION_WOPI_SRC: https://${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.opencloud.test} - COLLABORATION_APP_NAME: "OnlyOffice" - COLLABORATION_APP_PRODUCT: "OnlyOffice" - COLLABORATION_APP_ADDR: https://${ONLYOFFICE_DOMAIN:-onlyoffice.opencloud.test} - COLLABORATION_APP_ICON: https://${ONLYOFFICE_DOMAIN:-onlyoffice.opencloud.test}/web-apps/apps/documenteditor/main/resources/img/favicon.ico - COLLABORATION_APP_INSECURE: "${INSECURE:-true}" - COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}" - COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} - COLLABORATION_APP_PROOF_DISABLE: "true" - OC_URL: https://${OC_DOMAIN:-cloud.opencloud.test} - volumes: - # configure the .env file to use own paths instead of docker internal volumes - - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud - labels: - - "traefik.enable=true" - - "traefik.http.routers.collaboration-oo.entrypoints=https" - - "traefik.http.routers.collaboration-oo.rule=Host(`${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.opencloud.test}`)" - - "traefik.http.routers.collaboration-oo.tls.certresolver=http" - - "traefik.http.routers.collaboration-oo.service=collaboration-oo" - - "traefik.http.services.collaboration-oo.loadbalancer.server.port=9300" - logging: - driver: ${LOG_DRIVER:-local} - restart: always - - onlyoffice: - # if you want to use oo enterprise edition, use: onlyoffice/documentserver-ee: - # note, you also need to add a volume, see below - image: onlyoffice/documentserver:8.2.2 - # changelog https://github.com/ONLYOFFICE/DocumentServer/releases - networks: - opencloud-net: - entrypoint: - - /bin/sh - - /entrypoint-override.sh - environment: - WOPI_ENABLED: "true" - # self-signed certificates - USE_UNAUTHORIZED_STORAGE: "${INSECURE:-false}" - volumes: - # paths are relative to the main compose file - - ./config/onlyoffice/entrypoint-override.sh:/entrypoint-override.sh - - ./config/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.dist.json - # if you want to use oo enterprise edition, you need to add a volume for the license file - # for details see: Registering your Enterprise Edition version --> - # https://helpcenter.onlyoffice.com/installation/docs-enterprise-install-docker.aspx - labels: - - "traefik.enable=true" - - "traefik.http.routers.onlyoffice.entrypoints=https" - - "traefik.http.routers.onlyoffice.rule=Host(`${ONLYOFFICE_DOMAIN:-onlyoffice.opencloud.test}`)" - - "traefik.http.routers.onlyoffice.tls.certresolver=http" - - "traefik.http.routers.onlyoffice.service=onlyoffice" - - "traefik.http.services.onlyoffice.loadbalancer.server.port=80" - # websockets can't be opened when this is omitted - - "traefik.http.middlewares.onlyoffice.headers.customrequestheaders.X-Forwarded-Proto=https" - - "traefik.http.routers.onlyoffice.middlewares=onlyoffice" - logging: - driver: ${LOG_DRIVER:-local} - restart: always - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost/hosting/discovery"] diff --git a/deployments/examples/opencloud_full/opencloud.yml b/deployments/examples/opencloud_full/opencloud.yml index c9b955130c..7cda9cc560 100644 --- a/deployments/examples/opencloud_full/opencloud.yml +++ b/deployments/examples/opencloud_full/opencloud.yml @@ -53,7 +53,6 @@ services: PROXY_CSP_CONFIG_FILE_LOCATION: /etc/opencloud/csp.yaml # these three vars are needed to the csp config file to include the web office apps and the importer COLLABORA_DOMAIN: ${COLLABORA_DOMAIN:-collabora.opencloud.test} - ONLYOFFICE_DOMAIN: ${ONLYOFFICE_DOMAIN:-onlyoffice.opencloud.test} COMPANION_DOMAIN: ${COMPANION_DOMAIN:-companion.opencloud.test} # enable to allow using the banned passwords list OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: banned-password-list.txt