reorder stuff

This commit is contained in:
Willy Kloucek
2022-01-26 09:14:56 +01:00
parent d2467c03b4
commit 07da125bdd

View File

@@ -11,8 +11,7 @@ services:
command:
- "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}"
# letsencrypt configuration
- "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@e\
xample.org}"
- "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@example.org}"
- "--certificatesResolvers.http.acme.storage=/certs/acme.json"
- "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http"
# enable dashboard
@@ -33,11 +32,9 @@ services:
- "traefik-certs:/certs"
labels:
- "traefik.enable=${TRAEFIK_DASHBOARD:-false}"
- "traefik.http.middlewares.traefik-auth.basicauth.users=${TRAEFIK_BASIC_\
AUTH_USERS:-admin:$$apr1$$4vqie50r$$YQAmQdtmz5n9rEALhxJ4l.}" # defaults to admin:admin
- "traefik.http.middlewares.traefik-auth.basicauth.users=${TRAEFIK_BASIC_AUTH_USERS:-admin:$$apr1$$4vqie50r$$YQAmQdtmz5n9rEALhxJ4l.}" # defaults to admin:admin
- "traefik.http.routers.traefik.entrypoints=https"
- "traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:-traefik.ownc\
loud.test}`)"
- "traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:-traefik.owncloud.test}`)"
- "traefik.http.routers.traefik.middlewares=traefik-auth"
- "traefik.http.routers.traefik.tls.certresolver=http"
- "traefik.http.routers.traefik.service=api@internal"
@@ -182,20 +179,19 @@ services:
- ocs
- server
environment:
OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
OCS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
OCS_HTTP_ADDR: 0.0.0.0:9110
OCS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
OCS_ACCOUNT_BACKEND_TYPE: accounts
OCS_IDM_ADDRESS: https://${OCIS_DOMAIN:-ocis.owncloud.test}
REVA_GATEWAY: storage-gateway:9142
OCS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
OCS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please}
OCS_IDM_ADDRESS: https://${OCIS_DOMAIN:-ocis.owncloud.test}
REVA_GATEWAY: storage-gateway:9142
logging:
driver: "local"
restart: always
@@ -477,8 +473,8 @@ services:
OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
STORAGE_SHARES_ENDPOINT: storage-shares:9154
STORAGE_SHARES_GRPC_ADDR: 0.0.0.0:9154
STORAGE_SHARES_ENDPOINT: storage-shares:9154
STORAGE_SHARING_ENDPOINT: storage-sharing:9150
@@ -508,8 +504,8 @@ services:
STORAGE_USERS_DRIVER: ocis #TODO use s3?
STORAGE_USERS_ENDPOINT: storage-users:9157
STORAGE_USERS_GRPC_ADDR: 0.0.0.0:9157
STORAGE_USERS_ENDPOINT: storage-users:9157
STORAGE_USERS_HTTP_ADDR: 0.0.0.0:9158
STORAGE_USERS_DATA_SERVER_URL: http://storage-users:9158/data
@@ -567,7 +563,7 @@ services:
# TODO: does this scale?
STORAGE_SHARING_USER_DRIVER: json
STORAGE_SHARING_USER_JSON_FILE: /var/lib/ocis/storage/sharing/shares.json
STORAGE_SHARING_USER_JSON_FILE: /var/lib/ocis/storage/sharing/shares.json #TODO: enable subfolder to make volumes easier?
STORAGE_SHARING_PUBLIC_DRIVER: json
STORAGE_SHARING_PUBLIC_JSON_FILE: /var/lib/ocis/storage/sharing/publicshares.json