trim trailing whitespaces

This commit is contained in:
Willy Kloucek
2021-12-16 10:57:26 +01:00
parent a02a314ead
commit c11d4bf2e8

View File

@@ -103,7 +103,7 @@ services:
ACCOUNTS_HTTP_ADDR: 0.0.0.0:9181
ACCOUNTS_GRPC_ADDR: 0.0.0.0:9180
ACCOUNTS_STORAGE_BACKEND: cs3
ACCOUNTS_STORAGE_CS3_PROVIDER_ADDR: storage-metadata:9215
# TODO: remove one of those two jwt secrets
@@ -130,7 +130,7 @@ services:
GLAUTH_LDAP_ADDR: 0.0.0.0:9125
GLAUTH_LDAPS_ADDR: 0.0.0.0:9126
GLAUTH_BACKEND_INSECURE: "true" #TODO: insecure
logging:
driver: "local"
@@ -366,7 +366,7 @@ services:
#TODO: for metadata this is a totally different JWT secret
OCIS_JWT_SECRET: ${OCIS_METADATA_JWT_SECRET:-Pive-Fumkiu4}
STORAGE_JWT_SECRET: ${OCIS_METADATA_JWT_SECRET:-Pive-Fumkiu4}
#TODO: is this even needed for metadata
STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
@@ -393,7 +393,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_AUTH_BASIC_GRPC_ADDR: 0.0.0.0:9146
STORAGE_AUTH_BASIC_ENDPOINT: storage-authbasic:9146
@@ -417,7 +417,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_AUTH_MACHINE_GRPC_ADDR: 0.0.0.0:9148
STORAGE_AUTH_MACHINE_ENDPOINT: storage-authmachine:9148
@@ -441,7 +441,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_AUTH_BEARER_GRPC_ADDR: 0.0.0.0:9166
STORAGE_AUTH_BEARER_ENDPOINT: storage-authbearer:9166
@@ -465,7 +465,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_HOME_DATAPROVIDER_INSECURE: "true" #TODO: insecure
STORAGE_HOME_DRIVER: ocis #TODO use s3?
@@ -474,7 +474,7 @@ services:
STORAGE_HOME_GRPC_ADDR: 0.0.0.0:9154
STORAGE_HOME_HTTP_ADDR: 0.0.0.0:9155
STORAGE_HOME_DATA_SERVER_URL: http://storage-home:9155/data
STORAGE_HOME_DATA_SERVER_URL: http://storage-home:9155/data
STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
STORAGE_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
@@ -500,7 +500,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_USERS_DATAPROVIDER_INSECURE: "true" #TODO: insecure
STORAGE_USERS_DRIVER: ocis #TODO use s3?
@@ -509,7 +509,7 @@ services:
STORAGE_USERS_GRPC_ADDR: 0.0.0.0:9157
STORAGE_USERS_HTTP_ADDR: 0.0.0.0:9158
STORAGE_USERS_DATA_SERVER_URL: http://storage-users:9158/data
STORAGE_USERS_DATA_SERVER_URL: http://storage-users:9158/data
STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
STORAGE_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
@@ -518,7 +518,7 @@ services:
- "ocis-storage-users:/var/lib/ocis" #TODO /storage/users"
logging:
driver: "local"
restart: always
restart: always
storage-publiclink:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
@@ -534,7 +534,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_PUBLIC_LINK_ENDPOINT: storage-publiclink:9178
STORAGE_PUBLIC_GRPC_ADDR: 0.0.0.0:9178
@@ -542,7 +542,7 @@ services:
REVA_GATEWAY: storage-gateway:9142
logging:
driver: "local"
restart: always
restart: always
storage-sharing:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
@@ -558,7 +558,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_SHARING_ENDPOINT: storage-sharing:9150
STORAGE_SHARING_GRPC_ADDR: 0.0.0.0:9150
@@ -574,8 +574,8 @@ services:
- "ocis-storage-sharing:/var/lib/ocis" #TODO: /storage/sharing/"
logging:
driver: "local"
restart: always
restart: always
storage-userprovider:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
deploy:
@@ -590,7 +590,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144
STORAGE_USERPROVIDER_ADDR: 0.0.0.0:9144 # TODO: should reflect this is GRPC
@@ -607,7 +607,7 @@ services:
logging:
driver: "local"
restart: always
storage-groupprovider:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
deploy:
@@ -622,7 +622,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
STORAGE_GROUPPROVIDER_ADDR: 0.0.0.0:9160 #TODO: name should reflect this is GRPC
@@ -639,7 +639,7 @@ services:
logging:
driver: "local"
restart: always
storage-frontend:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
deploy:
@@ -691,7 +691,7 @@ services:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_GATEWAY_GRPC_ADDR: 0.0.0.0:9142
REVA_GATEWAY: storage-gateway:9142
@@ -709,7 +709,7 @@ services:
STORAGE_AUTH_MACHINE_ENDPOINT: storage-authmachine:9148
STORAGE_SHARING_ENDPOINT: storage-sharing:9150
STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144