From 4e548da8193be6661db1713f68de267aaeecf5ab Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 19 Oct 2020 11:10:57 +0200 Subject: [PATCH] clean up storage configuration and update storage documentation Signed-off-by: David Christofas --- docs/extensions/storage/_index.md | 20 ++++++-------------- storage/pkg/command/gateway.go | 2 -- storage/pkg/flagset/gateway.go | 8 -------- storage/pkg/flagset/storagehome.go | 2 +- storage/pkg/flagset/storageusers.go | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/docs/extensions/storage/_index.md b/docs/extensions/storage/_index.md index d0d0545b5..61307ec92 100644 --- a/docs/extensions/storage/_index.md +++ b/docs/extensions/storage/_index.md @@ -26,20 +26,12 @@ It uses the port range 9140-9179 to preconfigure several services. | 9149 | authbearer debug | | 9150 | sharing | | 9151 | sharing debug | -| 9152 | storage root | -| 9153 | storage root debug | | 9154 | storage home | -| 9155 | storage home debug | -| 9156 | storage home data | -| 9157 | storage home data debug | -| 9158 | storage eos | -| 9159 | storage eos debug | -| 9160 | storage eos data | -| 9161 | storage eos data debug | -| 9162 | storage oc | -| 9163 | storage oc debug | -| 9164 | storage oc data | -| 9165 | storage oc data debug | +| 9155 | storage home data | +| 9156 | storage home debug | +| 9157 | storage users | +| 9158 | storage users data | +| 9159 | storage users debug | | 9166-9177 | reserved for s3, wnd, custom + data providers | | 9178 | storage public link | -| 9179 | storage public link data | +| 9179 | storage public link debug | diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index a850bb42f..d64e2c7cc 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -244,8 +244,6 @@ func rules(cfg *config.Config) map[string]interface{} { cfg.Reva.StorageUsers.MountPath: cfg.Reva.StorageUsers.Endpoint, cfg.Reva.StorageUsers.MountID: cfg.Reva.StorageUsers.Endpoint, cfg.Reva.StoragePublicLink.MountPath: cfg.Reva.StoragePublicLink.Endpoint, - //TODO remove after talking to @jfd - cfg.Reva.StoragePublicLink.MountID: cfg.Reva.StorageHome.Endpoint, // public link storage returns the mount id of the actual storage // medatada storage not part of the global namespace } diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go index 7c182f894..95c25a933 100644 --- a/storage/pkg/flagset/gateway.go +++ b/storage/pkg/flagset/gateway.go @@ -233,14 +233,6 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { Destination: &cfg.Reva.StoragePublicLink.MountPath, }, // public-link has no mount id - // TODO after talking to @jfd - &cli.StringFlag{ - Name: "storage-public-link-mount-id", - Value: "1284d238-aa92-42ce-bdc4-0b0000009162", - Usage: "mount id", - EnvVars: []string{"STORAGE_PUBLIC_LINK_MOUNT_ID"}, - Destination: &cfg.Reva.StoragePublicLink.MountID, - }, } flags = append(flags, TracingWithConfig(cfg)...) diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go index 0bdf8c4c3..72d0d0c54 100644 --- a/storage/pkg/flagset/storagehome.go +++ b/storage/pkg/flagset/storagehome.go @@ -85,7 +85,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag { Name: "mount-id", // This is the mount id of the storage provider using the same storage driver // as /home but withoud home enabled. - Value: "1284d238-aa92-42ce-bdc4-0b0000009162", // /users + Value: "1284d238-aa92-42ce-bdc4-0b0000009157", // /users Usage: "mount id", EnvVars: []string{"STORAGE_HOME_MOUNT_ID"}, Destination: &cfg.Reva.StorageHome.MountID, diff --git a/storage/pkg/flagset/storageusers.go b/storage/pkg/flagset/storageusers.go index ae4cbade8..c5a53d198 100644 --- a/storage/pkg/flagset/storageusers.go +++ b/storage/pkg/flagset/storageusers.go @@ -82,7 +82,7 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ Name: "mount-id", - Value: "1284d238-aa92-42ce-bdc4-0b0000009162", // /users + Value: "1284d238-aa92-42ce-bdc4-0b0000009157", // /users Usage: "mount id", EnvVars: []string{"STORAGE_USERS_MOUNT_ID"}, Destination: &cfg.Reva.StorageUsers.MountID,