From 8b987e24b656299e69e36b3dbae25b97297e4bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 12 Feb 2020 21:17:21 +0100 Subject: [PATCH] storage providers now default to exposing data servers (#90) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .drone.star | 2 -- README.md | 8 ++++---- changelog/unreleased/issue-89.md | 8 ++++++++ pkg/flagset/storagehome.go | 1 + pkg/flagset/storageoc.go | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 changelog/unreleased/issue-89.md diff --git a/.drone.star b/.drone.star index fc3a1f226a..835cdaf13b 100644 --- a/.drone.star +++ b/.drone.star @@ -133,8 +133,6 @@ def testing(ctx): 'detach': True, 'environment' : { 'REVA_USERS_DRIVER': 'ldap', - 'REVA_STORAGE_HOME_EXPOSE_DATA_SERVER': 1, - 'REVA_STORAGE_OC_EXPOSE_DATA_SERVER': 1, 'REVA_LDAP_HOSTNAME': 'ldap', 'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root', diff --git a/README.md b/README.md index ff6a3153c8..60433b9ae5 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ bin/ocis-reva auth-basic & \ bin/ocis-reva auth-bearer & \ bin/ocis-reva sharing & \ bin/ocis-reva storage-root & \ -REVA_STORAGE_HOME_EXPOSE_DATA_SERVER=1 bin/ocis-reva storage-home & \ +bin/ocis-reva storage-home & \ bin/ocis-reva storage-home-data & \ -REVA_STORAGE_OC_EXPOSE_DATA_SERVER=1 bin/ocis-reva storage-oc & \ +bin/ocis-reva storage-oc & \ bin/ocis-reva storage-oc-data ``` @@ -90,9 +90,9 @@ For details on the `json` and `ldap` backends see the [documentation](https://ow bin/ocis-reva auth-bearer & \ bin/ocis-reva sharing & \ bin/ocis-reva storage-root & \ - REVA_STORAGE_HOME_EXPOSE_DATA_SERVER=1 bin/ocis-reva storage-home & \ + bin/ocis-reva storage-home & \ bin/ocis-reva storage-home-data & \ - REVA_STORAGE_OC_EXPOSE_DATA_SERVER=1 bin/ocis-reva storage-oc & \ + bin/ocis-reva storage-oc & \ bin/ocis-reva storage-oc-data & \ bin/ocis-reva frontend ``` diff --git a/changelog/unreleased/issue-89.md b/changelog/unreleased/issue-89.md new file mode 100644 index 0000000000..7631234735 --- /dev/null +++ b/changelog/unreleased/issue-89.md @@ -0,0 +1,8 @@ +Change: storage providers now default to exposing data servers + +The flags that let reva storage providers announce that they expose a data server now defaults to true: + +`REVA_STORAGE_HOME_EXPOSE_DATA_SERVER=1` +`REVA_STORAGE_OC_EXPOSE_DATA_SERVER=1` + +https://github.com/owncloud/ocis-reva/issues/89 \ No newline at end of file diff --git a/pkg/flagset/storagehome.go b/pkg/flagset/storagehome.go index f0d9e7e5f3..d735e27e20 100644 --- a/pkg/flagset/storagehome.go +++ b/pkg/flagset/storagehome.go @@ -160,6 +160,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag { }, &cli.BoolFlag{ Name: "expose-data-server", + Value: true, Usage: "exposes a dedicated data server", EnvVars: []string{"REVA_STORAGE_HOME_EXPOSE_DATA_SERVER"}, Destination: &cfg.Reva.StorageHome.ExposeDataServer, diff --git a/pkg/flagset/storageoc.go b/pkg/flagset/storageoc.go index 8d324a1e9e..64308a2581 100644 --- a/pkg/flagset/storageoc.go +++ b/pkg/flagset/storageoc.go @@ -160,6 +160,7 @@ func StorageOCWithConfig(cfg *config.Config) []cli.Flag { }, &cli.BoolFlag{ Name: "expose-data-server", + Value: true, Usage: "exposes a dedicated data server", EnvVars: []string{"REVA_STORAGE_OC_EXPOSE_DATA_SERVER"}, Destination: &cfg.Reva.StorageOC.ExposeDataServer,