From 66f19592df00dc99918e5a108281eb8294a60c26 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 22:32:19 +0200 Subject: [PATCH] fix: fix compose examples for onlyoffice and monitoring --- .../ocis_full/onlyoffice-rolling.yml | 2 +- deployments/examples/ocis_full/.env | 2 +- .../examples/ocis_full/monitoring_tracing/monitoring-oo.yml | 4 ++++ .../examples/ocis_full/monitoring_tracing/monitoring.yml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index 9ad56e587..467b4064a 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -37,7 +37,7 @@ OCIS_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis-onlyoffice.rolling.owncloud.works COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud - WOPISERVER_DOMAIN: wopiserver.ocis-onlyoffice.rolling.owncloud.works + WOPISERVER_ONLYOFFICE_DOMAIN: wopiserver-oo.ocis-onlyoffice.rolling.owncloud.works ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.rolling.owncloud.works INBUCKET_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works DEMO_USERS: "true" diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index d5913ca11..1f354e9bf 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -138,7 +138,7 @@ COLLABORA_ADMIN_PASSWORD= ## Debugging - Monitoring ## # Please see documentation at: https://owncloud.dev/ocis/deployment/monitoring-tracing/ # The leading colon is required to enable the service. -#MONITORING=:monitoring_tracing/monitoring.yml +MONITORING=:monitoring_tracing/monitoring.yml ## Uppy Companion Settings ## # The leading colon is required to enable the service. diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml index 414f8a322..396ed1b3f 100644 --- a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml +++ b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml @@ -20,3 +20,7 @@ services: OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 + +networks: + ocis-net: + external: true diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml b/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml index d7fa2e184..9fcc6a31e 100644 --- a/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml +++ b/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml @@ -20,3 +20,7 @@ services: OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 + +networks: + ocis-net: + external: true