From 222683d3cd3375efbbbe0001f8b79286b473d063 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 09:19:27 +0100 Subject: [PATCH] fix app provider env naming --- deployments/examples/ocis_wopi/docker-compose.yml | 12 ++++++------ docs/extensions/storage/apps.md | 3 ++- storage/pkg/config/config.go | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index a38ee897e..1cb1cf0a2 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -92,8 +92,8 @@ services: command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi @@ -118,8 +118,8 @@ services: #command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi @@ -146,8 +146,8 @@ services: #command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-codimd:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-codimd:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi diff --git a/docs/extensions/storage/apps.md b/docs/extensions/storage/apps.md index 26257509a..19826cf48 100644 --- a/docs/extensions/storage/apps.md +++ b/docs/extensions/storage/apps.md @@ -295,7 +295,8 @@ services: command: storage-app-provider server # start only the app driver environment: STORAGE_GATEWAY_ENDPOINT: ocis:9142 # oCIS gateway endpoint - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 # how oCIS can reach this app driver + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 # how oCIS can reach this app driver OCIS_JWT_SECRET: ocis-jwt-secret APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_DRIVER_APP_NAME: Collabora # will be used as name for this app diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 09746d994..c1a201ac6 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -794,6 +794,7 @@ func DefaultConfig() *Config { Users: Users{ Port: Port{ Endpoint: "localhost:9144", + DebugAddr: "127.0.0.1:9145", GRPCNetwork: "tcp", GRPCAddr: "127.0.0.1:9144", Services: []string{"userprovider"}, @@ -1081,19 +1082,19 @@ func structMappings(cfg *Config) []shared.EnvBinding { // app provider { - EnvVars: []string{"APP_PROVIDER_BASIC_DEBUG_ADDR"}, + EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR"}, Destination: &cfg.Reva.AppProvider.DebugAddr, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_GRPC_NETWORK"}, + EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK"}, Destination: &cfg.Reva.AppProvider.GRPCNetwork, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_GRPC_ADDR"}, + EnvVars: []string{"APP_PROVIDER_GRPC_ADDR"}, Destination: &cfg.Reva.AppProvider.GRPCAddr, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_EXTERNAL_ADDR"}, + EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR"}, Destination: &cfg.Reva.AppProvider.ExternalAddr, }, {