refactor: standardize service names and update port configurations for Euro Office integration

2026-08-07 12:28:43 +08:00 · 2026-04-20 13:36:03 +02:00
parent f01a8969bf
commit b5eb7bb7ca
6 changed files with 16 additions and 170 deletions
--- a/.env.example
+++ b/.env.example
@@ -28,10 +28,6 @@ INSECURE=true
 #COMPOSE_FILE=docker-compose.yml:weboffice/euroffice.yml:traefik/opencloud.yml:traefik/euroffice.yml
 # Euro Office with external proxy (Nginx, Caddy, etc.)
 #COMPOSE_FILE=docker-compose.yml:weboffice/euroffice.yml:external-proxy/opencloud.yml:external-proxy/euroffice.yml
-# Both Collabora and Euro Office with traefik
-#COMPOSE_FILE=docker-compose.yml:weboffice/collabora.yml:weboffice/euroffice.yml:traefik/opencloud.yml:traefik/collabora.yml:traefik/euroffice.yml
-# Both Collabora and Euro Office with external proxy
-#COMPOSE_FILE=docker-compose.yml:weboffice/collabora.yml:weboffice/euroffice.yml:external-proxy/opencloud.yml:external-proxy/collabora.yml:external-proxy/euroffice.yml

 ## Traefik Settings ##
 # Note: Traefik is always enabled and can't be disabled.
@@ -251,9 +247,6 @@ COLLABORA_HOME_MODE=
 # Domain of Euro Office, where you can find the document server.
 # Defaults to "euro-office.opencloud.test"
 EURO_OFFICE_DOMAIN=
-# Domain of the wopiserver which handles Euro Office.
-# Defaults to "wopiserver-eo.opencloud.test"
-EURO_OFFICE_WOPISERVER_DOMAIN=
 # JWT Secret for Euro Office. IMPORTANT: Change this for production!
 # Defaults to "changeme"
 EURO_OFFICE_JWT_SECRET=
--- a/config/euro-office/entrypoint-override.sh
+++ b/config/euro-office/entrypoint-override.sh
@@ -1,142 +0,0 @@
-#!/bin/sh
-
-update_welcome_page() {
-    WELCOME_PAGE="/var/www/onlyoffice/documentserver-example/welcome/docker.html"
-    EXAMPLE_DISABLED_PAGE="/var/www/onlyoffice/documentserver-example/welcome/example-disabled.html"
-
-    # Replace systemctl placeholder (set at build time) with docker+supervisorctl equivalent
-    sed -i 's|sudo systemctl start ds-example|sudo docker exec $(sudo docker ps -q) supervisorctl start ds:example|g' \
-        "$EXAMPLE_DISABLED_PAGE"
-
-    if [ -e "$WELCOME_PAGE" ]; then
-        DOCKER_CONTAINER_ID=$(basename "$(cat /proc/1/cpuset 2>/dev/null)")
-        if [ "${#DOCKER_CONTAINER_ID}" -lt 12 ]; then
-            DOCKER_CONTAINER_ID=$(hostname)
-        fi
-        if [ "${#DOCKER_CONTAINER_ID}" -ge 12 ]; then
-            if command -v docker > /dev/null 2>&1; then
-                DOCKER_CONTAINER_NAME=$(docker inspect --format="{{.Name}}" "$DOCKER_CONTAINER_ID" | sed 's|^/||')
-                sed -i "s|\$(sudo docker ps -q)|${DOCKER_CONTAINER_NAME}|g" \
-                    "$WELCOME_PAGE" "$EXAMPLE_DISABLED_PAGE"
-            else
-                DOCKER_CONTAINER_SHORT=$(echo "$DOCKER_CONTAINER_ID" | cut -c1-12)
-                sed -i "s|\$(sudo docker ps -q)|${DOCKER_CONTAINER_SHORT}|g" \
-                    "$WELCOME_PAGE" "$EXAMPLE_DISABLED_PAGE"
-            fi
-        fi
-    fi
-}
-
-# Create symlink for /config -> /etc/onlyoffice/documentserver so tools can find config
-ln -sf /etc/onlyoffice/documentserver /config 2>/dev/null || true
-
-service postgresql start
-runuser -u rabbitmq -- rabbitmq-server -detached
-service redis-server start
-service nginx start
-
-# Ensure the api.js.tpl template exists (required by documentserver-flush-cache.sh)
-API_TPL="/var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js.tpl"
-if [ ! -f "$API_TPL" ] && [ -f "/var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js" ]; then
-    cp /var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js "$API_TPL"
-fi
-
-# Generate all fonts (AllFonts.js, font_selection.bin, presentation themes)
-/usr/bin/documentserver-generate-allfonts.sh
-
-CONFIG_FILE="$EO_CONF/local.json"
-
-jq_filter='.'
-
-if [ -n "$JWT_SECRET" ]; then
-  jq_filter="$jq_filter | .services.CoAuthoring.secret.browser.string = \$jwtSecret"
-  jq_filter="$jq_filter | .services.CoAuthoring.secret.inbox.string   = \$jwtSecret"
-  jq_filter="$jq_filter | .services.CoAuthoring.secret.outbox.string  = \$jwtSecret"
-  jq_filter="$jq_filter | .services.CoAuthoring.secret.session.string = \$jwtSecret"
-fi
-
-[ -n "$DB_PASSWORD" ] && \
-  jq_filter="$jq_filter | .services.CoAuthoring.sql.dbPass = \$dbPassword"
-
-if [ "${USE_UNAUTHORIZED_STORAGE}" = "true" ]; then
-  jq_filter="$jq_filter | .services.CoAuthoring.requestDefaults.rejectUnauthorized = false"
-fi
-
-[ -n "$ALLOW_PRIVATE_IP_ADDRESS" ] && \
-  jq_filter="$jq_filter | .services.CoAuthoring[\"request-filtering-agent\"].allowPrivateIPAddress = true"
-
-[ -n "$ALLOW_META_IP_ADDRESS" ] && \
-  jq_filter="$jq_filter | .services.CoAuthoring[\"request-filtering-agent\"].allowMetaIPAddress = true"
-
-# ── WOPI configuration ─────────────────────────────────────────────────
-WOPI_ENABLED=${WOPI_ENABLED:-false}
-DATA_DIR="/var/www/onlyoffice/Data"
-WOPI_PRIVATE_KEY="${DATA_DIR}/wopi_private.key"
-WOPI_PUBLIC_KEY="${DATA_DIR}/wopi_public.key"
-
-mkdir -p "$DATA_DIR"
-
-if [ ! -f "$WOPI_PRIVATE_KEY" ]; then
-  echo -n "Generating WOPI private key..."
-  openssl genpkey -algorithm RSA -outform PEM -out "$WOPI_PRIVATE_KEY" >/dev/null 2>&1
-  echo "Done"
-fi
-
-if [ ! -f "$WOPI_PUBLIC_KEY" ]; then
-  echo -n "Generating WOPI public key..."
-  openssl rsa -RSAPublicKey_out -in "$WOPI_PRIVATE_KEY" \
-    -outform "MS PUBLICKEYBLOB" -out "$WOPI_PUBLIC_KEY" >/dev/null 2>&1
-  echo "Done"
-fi
-
-WOPI_PRIVATE_KEY_CONTENT=$(cat "$WOPI_PRIVATE_KEY")
-WOPI_PUBLIC_KEY_CONTENT=$(openssl base64 -in "$WOPI_PUBLIC_KEY" -A)
-WOPI_MODULUS=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -modulus -noout \
-  -in "$WOPI_PUBLIC_KEY" | sed 's/Modulus=//' | \
-  python3 -c "import sys,binascii,base64; print(base64.b64encode(binascii.unhexlify(sys.stdin.read().strip())).decode())")
-
-WOPI_EXPONENT=$(openssl rsa -pubin -inform "MS PUBLICKEYBLOB" -text -noout \
-  -in "$WOPI_PUBLIC_KEY" | grep -oP '(?<=Exponent: )\d+')
-
-jq_filter="$jq_filter | .wopi.enable = \$wopiEnabled"
-jq_filter="$jq_filter | .wopi.privateKey = \$wopiPrivateKey"
-jq_filter="$jq_filter | .wopi.privateKeyOld = \$wopiPrivateKey"
-jq_filter="$jq_filter | .wopi.publicKey = \$wopiPublicKey"
-jq_filter="$jq_filter | .wopi.publicKeyOld = \$wopiPublicKey"
-jq_filter="$jq_filter | .wopi.modulus = \$wopiModulus"
-jq_filter="$jq_filter | .wopi.modulusOld = \$wopiModulus"
-jq_filter="$jq_filter | .wopi.exponent = (\$wopiExponent | tonumber)"
-jq_filter="$jq_filter | .wopi.exponentOld = (\$wopiExponent | tonumber)"
-# ── End WOPI configuration ─────────────────────────────────────────────
-
-if [ "$jq_filter" != "." ]; then
-  if [ "$WOPI_ENABLED" = "true" ]; then
-    WOPI_ENABLED_JQ="true"
-  else
-    WOPI_ENABLED_JQ="false"
-  fi
-
-  jq \
-    --arg jwtSecret "$JWT_SECRET" \
-    --arg dbPassword "$DB_PASSWORD" \
-    --argjson wopiEnabled "$WOPI_ENABLED_JQ" \
-    --arg wopiPrivateKey "$WOPI_PRIVATE_KEY_CONTENT" \
-    --arg wopiPublicKey "$WOPI_PUBLIC_KEY_CONTENT" \
-    --arg wopiModulus "$WOPI_MODULUS" \
-    --arg wopiExponent "$WOPI_EXPONENT" \
-    "$jq_filter" \
-    "$CONFIG_FILE" > "${CONFIG_FILE}.tmp"
-
-  mv "${CONFIG_FILE}.tmp" "$CONFIG_FILE"
-fi
-
-update_welcome_page
-
-enable_supervisor_program() {
-    sed -i 's/^autostart=false$/autostart=true/' "/etc/supervisor/conf.d/$1.conf"
-}
-
-[ "${ADMINPANEL_ENABLED:-false}" = "true" ] && enable_supervisor_program ds-adminpanel
-[ "${EXAMPLE_ENABLED:-false}" = "true" ]    && enable_supervisor_program ds-example
-
-/usr/bin/supervisord
--- a/external-proxy/euroffice-exposed.yml
+++ b/external-proxy/euroffice-exposed.yml
@@ -1,10 +1,10 @@
 ---
 # only expose the ports when you know what you are doing!
 services:
-  collaboration-eo:
+  collaboration:
    ports:
-      # expose the euro-office wopi server on all interfaces
-      - "0.0.0.0:9302:9300"
+      # expose the wopi server on all interfaces
+      - "0.0.0.0:9300:9300"
  euro-office:
    ports:
      # expose the euro-office document server on all interfaces
--- a/external-proxy/euroffice.yml
+++ b/external-proxy/euroffice.yml
@@ -1,9 +1,9 @@
 ---
 services:
-  collaboration-eo:
+  collaboration:
    ports:
-      # expose the euro-office wopi server on localhost
-      - "127.0.0.1:9302:9300"
+      # expose the wopi server on localhost
+      - "127.0.0.1:9300:9300"
  euro-office:
    ports:
      # expose the euro-office document server on localhost
--- a/traefik/euroffice.yml
+++ b/traefik/euroffice.yml
@@ -5,16 +5,16 @@ services:
      opencloud-net:
        aliases:
          - ${EURO_OFFICE_DOMAIN:-euro-office.opencloud.test}
-          - ${EURO_OFFICE_WOPISERVER_DOMAIN:-wopiserver-eo.opencloud.test}
-  collaboration-eo:
+          - ${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}
+  collaboration:
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.collaboration-eo.entrypoints=https"
-      - "traefik.http.routers.collaboration-eo.rule=Host(`${EURO_OFFICE_WOPISERVER_DOMAIN:-wopiserver-eo.opencloud.test}`)"
-      - "traefik.http.routers.collaboration-eo.${TRAEFIK_SERVICES_TLS_CONFIG}"
-      - "traefik.http.routers.collaboration-eo.service=collaboration-eo"
-      - "traefik.http.routers.collaboration-eo.middlewares=hsts-header"
-      - "traefik.http.services.collaboration-eo.loadbalancer.server.port=9300"
+      - "traefik.http.routers.collaboration.entrypoints=https"
+      - "traefik.http.routers.collaboration.rule=Host(`${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}`)"
+      - "traefik.http.routers.collaboration.${TRAEFIK_SERVICES_TLS_CONFIG}"
+      - "traefik.http.routers.collaboration.service=collaboration"
+      - "traefik.http.routers.collaboration.middlewares=hsts-header"
+      - "traefik.http.services.collaboration.loadbalancer.server.port=9300"
  euro-office:
    labels:
      - "traefik.enable=true"
--- a/weboffice/euroffice.yml
+++ b/weboffice/euroffice.yml
@@ -12,7 +12,7 @@ services:
    volumes:
      - ./config/euro-office/app-registry.yaml:/etc/opencloud/app-registry.yaml

-  collaboration-eo:
+  collaboration:
    # renovate: depName=opencloudeu/opencloud-rolling
    image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-6.0.0}
    user: ${OC_CONTAINER_UID_GID:-1000:1000}
@@ -31,10 +31,9 @@ services:
      COLLABORATION_HTTP_ADDR: 0.0.0.0:9300
      MICRO_REGISTRY: "nats-js-kv"
      MICRO_REGISTRY_ADDRESS: "opencloud:9233"
-      COLLABORATION_WOPI_SRC: https://${EURO_OFFICE_WOPISERVER_DOMAIN:-wopiserver-eo.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-}
+      COLLABORATION_WOPI_SRC: https://${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-}
      COLLABORATION_APP_NAME: "Euro-Office"
      COLLABORATION_APP_PRODUCT: "OnlyOffice"
-      COLLABORATION_SERVICE_NAME: "collaboration-eo"
      COLLABORATION_APP_ADDR: https://${EURO_OFFICE_DOMAIN:-euro-office.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-}
      COLLABORATION_APP_ICON: https://${EURO_OFFICE_DOMAIN:-euro-office.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-}/web-apps/apps/documenteditor/main/resources/img/favicon.ico
      COLLABORATION_APP_INSECURE: "${INSECURE:-true}"
@@ -54,16 +53,12 @@ services:
    # changelog https://github.com/EURO-office/DocumentServer/releases
    networks:
      opencloud-net:
-    entrypoint:
-      - /bin/sh
-      - /entrypoint-override.sh
    environment:
      WOPI_ENABLED: "true"
      JWT_SECRET: "${EURO_OFFICE_JWT_SECRET:-changeme}"
      # self-signed certificates
      USE_UNAUTHORIZED_STORAGE: "${INSECURE:-false}"
    volumes:
-      - ./config/euro-office/entrypoint-override.sh:/entrypoint-override.sh
      - ./config/euro-office/onlyoffice-docs-formats.json:/var/www/onlyoffice/documentserver/document-formats/onlyoffice-docs-formats.json
    logging:
      driver: ${LOG_DRIVER:-local}