From 3fafbc88bd909eb00d4f5cb42ec4110a8deb77d7 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 12 Mar 2021 21:26:56 +0100 Subject: [PATCH] fix typos --- storage/pkg/flagset/authbearer.go | 2 +- storage/pkg/flagset/driverocis.go | 4 ++-- storage/pkg/flagset/frontend.go | 17 +++++++++-------- storage/pkg/flagset/groups.go | 2 +- storage/pkg/flagset/storagemetadata.go | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/storage/pkg/flagset/authbearer.go b/storage/pkg/flagset/authbearer.go index d822a95986..d35e3bd2ea 100644 --- a/storage/pkg/flagset/authbearer.go +++ b/storage/pkg/flagset/authbearer.go @@ -92,7 +92,7 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag { &cli.StringFlag{ Name: "gateway-url", - Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "0.0.0.0:9142"), + Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), Usage: "URL to use for the storage gateway service", EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, Destination: &cfg.Reva.Gateway.Endpoint, diff --git a/storage/pkg/flagset/driverocis.go b/storage/pkg/flagset/driverocis.go index dd323479b8..76eb5e61b4 100644 --- a/storage/pkg/flagset/driverocis.go +++ b/storage/pkg/flagset/driverocis.go @@ -11,7 +11,7 @@ func DriverOCISWithConfig(cfg *config.Config) []cli.Flag { return []cli.Flag{ &cli.StringFlag{ Name: "storage-ocis-root", - Value: flags.OverrideDefaultString(cfg.Reva.Storages.Local.Root, "/var/tmp/ocis/storage/users"), + Value: flags.OverrideDefaultString(cfg.Reva.Storages.Common.Root, "/var/tmp/ocis/storage/users"), Usage: "the path to the local storage root", EnvVars: []string{"STORAGE_DRIVER_OCIS_ROOT"}, Destination: &cfg.Reva.Storages.Common.Root, @@ -25,7 +25,7 @@ func DriverOCISWithConfig(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ Name: "storage-ocis-layout", - Value: flags.OverrideDefaultString(cfg.Reva.Storages.Local.Root, "{{.Id.OpaqueId}}"), + Value: flags.OverrideDefaultString(cfg.Reva.Storages.Common.UserLayout, "{{.Id.OpaqueId}}"), Usage: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.Mail}}, {{.Id.OpaqueId}}, {{.Id.Idp}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "Ei/Einstein" `, EnvVars: []string{"STORAGE_DRIVER_OCIS_LAYOUT"}, Destination: &cfg.Reva.Storages.Common.UserLayout, diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go index 3033ab30db..b29f16db62 100644 --- a/storage/pkg/flagset/frontend.go +++ b/storage/pkg/flagset/frontend.go @@ -31,13 +31,14 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { // OCDav - &cli.StringFlag{ - Name: "chunk-folder", - Value: flags.OverrideDefaultString(cfg.Reva.OCDav.WebdavNamespace, "/var/tmp/ocis/tmp/chunks"), - Usage: "temp directory for chunked uploads", - EnvVars: []string{"STORAGE_CHUNK_FOLDER"}, - Destination: &cfg.Reva.OCDav.WebdavNamespace, - }, + //&cli.StringFlag{ + // Name: "chunk-folder", + // Value: flags.OverrideDefaultString(cfg.Reva.OCDav.WebdavNamespace, "/var/tmp/ocis/tmp/chunks"), + // Usage: "temp directory for chunked uploads", + // EnvVars: []string{"STORAGE_CHUNK_FOLDER"}, + // Destination: &cfg.Reva.OCDav.WebdavNamespace, + //}, + &cli.StringFlag{ Name: "webdav-namespace", Value: flags.OverrideDefaultString(cfg.Reva.OCDav.WebdavNamespace, "/home/"), @@ -46,7 +47,7 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag { Destination: &cfg.Reva.OCDav.WebdavNamespace, }, - // the /dav/files endpoint expects a username as the first path segment + // th/dav/files endpoint expects a username as the first path segment // this can eg. be set to /eos/users &cli.StringFlag{ Name: "dav-files-namespace", diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go index a55be77c11..cde2810206 100644 --- a/storage/pkg/flagset/groups.go +++ b/storage/pkg/flagset/groups.go @@ -39,7 +39,7 @@ func GroupsWithConfig(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ Name: "endpoint", - Value: flags.OverrideDefaultString(cfg.Reva.Groups.Endpoint, "0.0.0.0:9160"), + Value: flags.OverrideDefaultString(cfg.Reva.Groups.Endpoint, "localhost:9160"), Usage: "URL to use for the storage service", EnvVars: []string{"STORAGE_GROUPPROVIDER_ENDPOINT"}, Destination: &cfg.Reva.Groups.Endpoint, diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go index 4bc3c89f63..4cabf5bcfa 100644 --- a/storage/pkg/flagset/storagemetadata.go +++ b/storage/pkg/flagset/storagemetadata.go @@ -32,7 +32,7 @@ func StorageMetadata(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ Name: "data-server-url", - Value: flags.OverrideDefaultString(cfg.Reva.StorageMetadata.DataServerURL, "0.0.0.0:9216"), + Value: flags.OverrideDefaultString(cfg.Reva.StorageMetadata.DataServerURL, "http://localhost:9216"), Usage: "URL of the data-provider the storage-provider uses", EnvVars: []string{"STORAGE_METADATA_DATA_SERVER_URL"}, Destination: &cfg.Reva.StorageMetadata.DataServerURL,