From 0856740e0896119966eb3abb98d22082a6550991 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Mon, 12 Oct 2020 10:42:26 +0545 Subject: [PATCH 1/2] rename reva to storage in EOS docs --- docs/ocis/eos.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/ocis/eos.md b/docs/ocis/eos.md index 4815d393cc..7c7b84cb23 100644 --- a/docs/ocis/eos.md +++ b/docs/ocis/eos.md @@ -15,7 +15,7 @@ This document is a work in progress of the current setup. ## Docker dev environment for eos storage -We begin with the docker-compose.yml found in https://github.com/owncloud/ocis/ and +We begin with the docker-compose.yml found in https://github.com/owncloud/ocis/ and switch it to eos-storage. ### 1. Start eos & ocis containers @@ -49,10 +49,10 @@ uid=20000(einstein) gid=30000(users) groups=30000(users),30001(sailing-lovers),3 If the user is not found at first you might need to wait a few more minutes in case the ocis container is still compiling. {{< /hint >}} -We also need to restart the reva-users service so it picks up the changed environment. Without a restart it is not able to resolve users from LDAP. +We also need to restart the storage-users service, so it picks up the changed environment. Without a restart it is not able to resolve users from LDAP. ``` -docker-compose exec ocis ./bin/ocis kill reva-users -docker-compose exec ocis ./bin/ocis run reva-users +docker-compose exec ocis ./bin/ocis kill storage-users +docker-compose exec ocis ./bin/ocis run storage-users ``` ### 3. Home storage @@ -60,8 +60,8 @@ docker-compose exec ocis ./bin/ocis run reva-users Kill the home storage. By default it uses the `owncloud` storage driver. We need to switch it to the `eoshome` driver and make it use the storage id of the eos storage provider: ``` -docker-compose exec ocis ./bin/ocis kill reva-storage-home -docker-compose exec -e REVA_STORAGE_HOME_DRIVER=eoshome -e REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run reva-storage-home +docker-compose exec ocis ./bin/ocis kill storage-storage-home +docker-compose exec -e STORAGE_STORAGE_HOME_DRIVER=eoshome -e STORAGE_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run storage-storage-home ``` ### 4. Home data provider @@ -69,8 +69,8 @@ docker-compose exec -e REVA_STORAGE_HOME_DRIVER=eoshome -e REVA_STORAGE_HOME_MOU Kill the home data provider. By default it uses the `owncloud` storage driver. We need to switch it to the `eoshome` driver and make it use the storage id of the eos storage provider: ``` -docker-compose exec ocis ./bin/ocis kill reva-storage-home-data -docker-compose exec -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data +docker-compose exec ocis ./bin/ocis kill storage-storage-home-data +docker-compose exec -e STORAGE_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run storage-storage-home-data ``` {{< hint info >}} @@ -199,7 +199,7 @@ The ocis logs can be accessed using `docker-compose logs ocis`. Add `-f` for fol 1. `docker-compose exec ocis make clean build` to update the binary 2. `docker-compose exec ocis ./bin/ocis kill ` to kill the service 3. `docker-compose exec ocis ./bin/ocis run ` to start the service. Do not forget to set any env vars, eg. - `docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home` + `docker-compose exec -e STORAGE_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e STORAGE_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run storage-storage-home` ### Creation and upload of files does not work From 8d68516eb79ba692c50378bc9352484112999f97 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Mon, 12 Oct 2020 10:59:02 +0545 Subject: [PATCH 2/2] rename reva to storage in docker-compose file --- ocis/docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml index 81516f89e7..ccdc66e9b7 100644 --- a/ocis/docker-compose.yml +++ b/ocis/docker-compose.yml @@ -44,19 +44,19 @@ services: 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 - REVA_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200 - REVA_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200 - # 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 + STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200 + STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200 + # TODO make id the default in ocis-storage + STORAGE_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" + STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200 + STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data # 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" + STORAGE_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} + STORAGE_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} + STORAGE_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 image: owncloud/eos-mgm:4.6.5