fix STORAGE_DATAGATEWAY_PUBLIC_URL and STORAGE_DATAGATEWAY_PUBLIC_URL

This commit is contained in:
Willy Kloucek
2020-11-13 08:05:17 +01:00
parent b90a6b9a48
commit 32ca22a2ac
4 changed files with 8 additions and 8 deletions
@@ -140,8 +140,8 @@ services:
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN} STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN}
STORAGE_OIDC_INSECURE: "${INSECURE}" STORAGE_OIDC_INSECURE: "${INSECURE}"
STORAGE_TRANSFER_EXPIRES: 86400 STORAGE_TRANSFER_EXPIRES: 86400
STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN} STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN}
STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN}/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN}/data
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN} STORAGE_LDAP_IDP: https://${OCIS_DOMAIN}
volumes: volumes:
- ./ocis/config/proxy-config.json:/etc/ocis/proxy.json - ./ocis/config/proxy-config.json:/etc/ocis/proxy.json
@@ -51,8 +51,8 @@ services:
PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN} PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN}
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN} STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN}
STORAGE_TRANSFER_EXPIRES: 86400 STORAGE_TRANSFER_EXPIRES: 86400
STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN} STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN}
STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN}/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN}/data
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN} STORAGE_LDAP_IDP: https://${OCIS_DOMAIN}
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
+2 -2
View File
@@ -43,8 +43,8 @@ services:
ACCOUNTS_STORAGE_DISK_PATH: /var/tmp/ocis-accounts ACCOUNTS_STORAGE_DISK_PATH: /var/tmp/ocis-accounts
# TODO make id the default in ocis-storage # TODO make id the default in ocis-storage
STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200 STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
# common eos settings used for both drivers: eos and eoshome # common eos settings used for both drivers: eos and eoshome
STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+2 -2
View File
@@ -48,8 +48,8 @@ services:
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200 STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
# TODO make id the default in ocis-storage # TODO make id the default in ocis-storage
STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200 STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
# common eos settings used for both drivers: eos and eoshome # common eos settings used for both drivers: eos and eoshome
STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}