cleanup env vars

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · Aug 27, 2020 · b9d6e0b · b9d6e0b
1 parent 77eb8b8
commit b9d6e0b
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,34 +24,28 @@ services:
       - ../ocis-reva:/ocis-reva
       - ../reva:/reva
     environment:
-      EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      # ocis log level will be used for all services
+      OCIS_LOG_LEVEL: debug
+      # domain setup
+      # TODO currently the below lines hardcode the port to 9200, use an OCIS_URL that includes protocol and port
       OCIS_DOMAIN: ${OCIS_DOMAIN:-localhost}
+      PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
       KONNECTD_ISS: https://${OCIS_DOMAIN:-localhost}:9200
-      KONNECTD_LOG_LEVEL: debug
-      KONNECTD_TLS: '0'
       PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200
       PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration
       PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
-      PROXY_HTTP_ADDR: 0.0.0.0:9200
       REVA_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
       REVA_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
-      OCIS_LOG_LEVEL: debug
-      REVA_TRANSFER_EXPIRES: 86400
-      REVA_STORAGE_EOS_DRIVER: eos
-      REVA_STORAGE_EOS_DATA_DRIVER: eos
-      REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
-      REVA_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      REVA_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      # TODO make id the default in ocis-reva
       REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
       REVA_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
       REVA_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
-      # TODO dav/files namespace is broken because it should use /home not /oc or /eos
-      # in ocdav check if dav/files/<userid> = the current users id,
-      # when true -> /home
-      # when false -> /eos/{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}
-      # TODO split docker compose files into dedicated eos and owncloud driver setups
-      # TODO clarify env vars for EOS DRIVER vs EOS PROVIDER specific configuration
-      # TODO update names.md file with this scenario
+      # common eos settings used for both drivers: eos and eoshome
+      REVA_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      REVA_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
+      # the eos end xrdcopy binaries use this env var to find the eos mgm
+      EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
 
   mgm-master:
     container_name: mgm-master