From 0d7fee8ed52969021544f0a3e5f46c53e459af0b Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 24 Jan 2022 13:19:39 +0100 Subject: [PATCH] fix sharing --- deployments/examples/ocis_individual_services/.env | 4 ++-- .../ocis_individual_services/docker-compose.yml | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deployments/examples/ocis_individual_services/.env b/deployments/examples/ocis_individual_services/.env index 71ce54e142..01ebb3fb20 100644 --- a/deployments/examples/ocis_individual_services/.env +++ b/deployments/examples/ocis_individual_services/.env @@ -20,11 +20,11 @@ OCIS_DOMAIN= OCIS_LOG_PRETTY=true OCIS_LOG_COLOR=true -OCIS_LOG_LEVEL=debug +OCIS_LOG_LEVEL=warn OCIS_BASIC_AUTH=true -OCIS_SCALE=3 +OCIS_SCALE=1 OCIS_JWT_SECRET=foobaz diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml index cff4279431..a219291694 100644 --- a/deployments/examples/ocis_individual_services/docker-compose.yml +++ b/deployments/examples/ocis_individual_services/docker-compose.yml @@ -68,7 +68,7 @@ services: PROXY_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} PROXY_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} - PROXY_INSECURE_BACKENDS: false + PROXY_INSECURE_BACKENDS: "false" PROXY_OIDC_INSECURE: "${INSECURE:-false}" PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test} @@ -319,6 +319,7 @@ services: WEBDAV_HTTP_ADDR: 0.0.0.0:9115 OCIS_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} + REVA_GATEWAY: storage-gateway:9142 logging: driver: "local" restart: always @@ -464,7 +465,7 @@ services: storage-shares: image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} deploy: - replicas: 1 + replicas: ${OCIS_SCALE:-1} networks: ocis-net: null entrypoint: @@ -479,14 +480,11 @@ services: STORAGE_SHARES_ENDPOINT: storage-shares:9154 STORAGE_SHARES_GRPC_ADDR: 0.0.0.0:9154 - # TODO: is this even needed? - #STORAGE_SHARES_HTTP_ADDR: 0.0.0.0:9155 + STORAGE_SHARING_ENDPOINT: storage-sharing:9150 STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret} STORAGE_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} REVA_GATEWAY: storage-gateway:9142 - #volumes: - # TODO: volume needed? logging: driver: "local" restart: always