Merge pull request #2073 from owncloud/deployment_examples_disable_co…

…llabora_welcome_message [deployment examples] improve WOPI server example
owncloud · May 25, 2021 · e67e613 · e67e613
2 parents 3ca92bc + 427c097
commit e67e613
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/deployments/examples/ocis_traefik/.env b/deployments/examples/ocis_traefik/.env
@@ -18,11 +18,11 @@ OCIS_DOCKER_TAG=
 # Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test"
 OCIS_DOMAIN=
 # IDP LDAP bind password. Must be changed in order to have a secure oCIS. Defaults to "idp".
-IDP_LDAP_BIND_PASSWORD=foo
+IDP_LDAP_BIND_PASSWORD=
 # Storage LDAP bind password. Must be changed in order to have a secure oCIS. Defaults to "reva".
-STORAGE_LDAP_BIND_PASSWORD=foo
+STORAGE_LDAP_BIND_PASSWORD=
 # JWT secret which is used for the storage provider. Must be changed in order to have a secure oCIS. Defaults to "Pive-Fumkiu4"
-OCIS_JWT_SECRET=foo
+OCIS_JWT_SECRET=
 
 # If you want to use debugging and tracing with this stack,
 # you need uncomment following line. Please see documentation at

diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml
@@ -91,6 +91,7 @@ services:
       ocis-net:
     environment:
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
+      WOPISERVER_REVA_GATEWAY: ocis:9142
       WOPISERVER_WOPI_SERVER_HOST: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}
       WOPISERVER_WOPI_SERVER_SECRET: ${WOPI_JWT_SECRET:-Pive-Fumkiu4}
       WOPISERVER_WOPI_SERVER_INSECURE: "${INSECURE:-false}"
@@ -138,7 +139,7 @@ services:
     environment:
       - domain=${OCIS_DOMAIN:-ocis.owncloud.test}
       - DONT_GEN_SSL_CERT=YES
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test}
+      - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:welcome.enable=false --o:net.frame_ancestors=${OCIS_DOMAIN:-ocis.owncloud.test}
       - username=${COLLABORA_ADMIN_USER}
       - password=${COLLABORA_ADMIN_PASSWORD}
     cap_add: