Skip to content

Commit

Permalink
Merge pull request #9425 from phil-davis/refactor_ocis_wopi_deployment-2
Browse files Browse the repository at this point in the history
[docs-only] [5.0] Adjust some text in ocis_wopi example
  • Loading branch information
micbar authored Jun 20, 2024
2 parents 87c3384 + 10c189d commit f6bd1ad
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions deployments/examples/ocis_wopi/.env
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ WOPISERVER_DOCKER_TAG=
# cs3org WOPI Server Domain. Defaults to "wopiserver.owncloud.test"
WOPISERVER_DOMAIN=

# JWT secret which is used for the documents to be request by the WOPI client
# JWT secret which is used for the documents to be requested by the WOPI client
# from the cs3org WOPI server. Must be changed in order to have a secure WOPI server.
# Defaults to "LoremIpsum567"
WOPI_JWT_SECRET=
Expand Down Expand Up @@ -188,7 +188,7 @@ ONLYOFFICE_DOMAIN=
# Domain for Inbucket. Defaults to "mail.owncloud.test"
INBUCKET_DOMAIN=

# Mutual exclusive with ocis settings, only uncomment when the ocis settings are NOT set
# Mutually exclusive with ocis settings, only uncomment when the ocis settings are NOT set
#SMTP_HOST=inbucket
#SMTP_PORT=2500
#SMTP_SENDER="oCIS notifications <notifications@${OCIS_DOMAIN:-ocis.owncloud.test}>"
Expand All @@ -199,7 +199,7 @@ INBUCKET_DOMAIN=

### IMPORTANT ###
# This MUST be the last line as it assembles the supplemental compose files to be used.
# ALL supplemental configs must be added here, independent if commented or not.
# ALL supplemental configs must be added here, whether commented or not.
# Each var must either be empty or contain :path/file.yml
COMPOSE_FILE=docker-compose.yml${OCIS:-}${TIKA:-}${WOPISERVER:-}${COLLABORA:-}${MONITORING:-}${COMPANION:-}${ONLYOFFICE:-}${INBUCKET:-}

2 changes: 1 addition & 1 deletion deployments/examples/ocis_wopi/collabora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-info}
# use the internal service name of the gateway
APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164
# configure the service name to avoid collision with like with onlyoffice
# configure the service name to avoid collision with other apps like onlyoffice
APP_PROVIDER_SERVICE_NAME: app-provider-collabora
# use the internal service name
APP_PROVIDER_EXTERNAL_ADDR: com.owncloud.api.app-provider-collabora
Expand Down
2 changes: 1 addition & 1 deletion deployments/examples/ocis_wopi/ocis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
MICRO_REGISTRY_ADDRESS: 127.0.0.1:9233
NATS_NATS_HOST: 0.0.0.0
NATS_NATS_PORT: 9233
# enable to allow using the banned passwords
# enable to allow using the banned passwords list
#OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: banned-password-list.txt
volumes:
# paths are relative to the main compose file
Expand Down
6 changes: 3 additions & 3 deletions deployments/examples/ocis_wopi/onlyoffice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- /entrypoint-override.sh
environment:
WOPI_ENABLED: "true"
# self signed certificates
# self-signed certificates
USE_UNAUTHORIZED_STORAGE: "${INSECURE:-false}"
volumes:
# paths are relative to the main compose file
Expand All @@ -30,7 +30,7 @@ services:
- "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 ommitted
# 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:
Expand All @@ -48,7 +48,7 @@ services:
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-info}
# use the internal service name of the gateway
APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164
# configure the service name to avoid collision like with with collabora
# configure the service name to avoid collision with other apps like collabora
APP_PROVIDER_SERVICE_NAME: app-provider-onlyoffice
# use the internal service name
APP_PROVIDER_EXTERNAL_ADDR: com.owncloud.api.app-provider-onlyoffice
Expand Down

0 comments on commit f6bd1ad

Please sign in to comment.