sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up storage configuration and update storage documentation

Browse Source 
Signed-off-by: David Christofas <dchristofas@owncloud.com>
This commit is contained in:
David Christofas
2020-10-21 10:15:10 +02:00
parent dd4c320377
commit 4e548da819
5 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/extensions/storage/_index.md
+6 -14
View File
@@ -26,20 +26,12 @@ It uses the port range 9140-9179 to preconfigure several services.
| 9149 | authbearer debug | | 9149 | authbearer debug |
| 9150 | sharing | | 9150 | sharing |
| 9151 | sharing debug | | 9151 | sharing debug |
| 9152 | storage root |
| 9153 | storage root debug |
| 9154 | storage home | | 9154 | storage home |
| 9155 | storage home debug | | 9155 | storage home data |
| 9156 | storage home data | | 9156 | storage home debug |
| 9157 | storage home data debug | | 9157 | storage users |
| 9158 | storage eos | | 9158 | storage users data |
| 9159 | storage eos debug | | 9159 | storage users 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 |
| 9166-9177 | reserved for s3, wnd, custom + data providers | | 9166-9177 | reserved for s3, wnd, custom + data providers |
| 9178 | storage public link | | 9178 | storage public link |
| 9179 | storage public link data | | 9179 | storage public link debug |
storage/pkg/command/gateway.go
-2
View File
@@ -244,8 +244,6 @@ func rules(cfg *config.Config) map[string]interface{} {
cfg.Reva.StorageUsers.MountPath: cfg.Reva.StorageUsers.Endpoint, cfg.Reva.StorageUsers.MountPath: cfg.Reva.StorageUsers.Endpoint,
cfg.Reva.StorageUsers.MountID: cfg.Reva.StorageUsers.Endpoint, cfg.Reva.StorageUsers.MountID: cfg.Reva.StorageUsers.Endpoint,
cfg.Reva.StoragePublicLink.MountPath: cfg.Reva.StoragePublicLink.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 // public link storage returns the mount id of the actual storage
// medatada storage not part of the global namespace // medatada storage not part of the global namespace
} }
storage/pkg/flagset/gateway.go
-8
View File
@@ -233,14 +233,6 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
Destination: &cfg.Reva.StoragePublicLink.MountPath, Destination: &cfg.Reva.StoragePublicLink.MountPath,
}, },
// public-link has no mount id // 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)...) flags = append(flags, TracingWithConfig(cfg)...)
storage/pkg/flagset/storagehome.go
+1 -1
View File
@@ -85,7 +85,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
Name: "mount-id", Name: "mount-id",
// This is the mount id of the storage provider using the same storage driver // This is the mount id of the storage provider using the same storage driver
// as /home but withoud home enabled. // as /home but withoud home enabled.
Value: "1284d238-aa92-42ce-bdc4-0b0000009162", // /users Value: "1284d238-aa92-42ce-bdc4-0b0000009157", // /users
Usage: "mount id", Usage: "mount id",
EnvVars: []string{"STORAGE_HOME_MOUNT_ID"}, EnvVars: []string{"STORAGE_HOME_MOUNT_ID"},
Destination: &cfg.Reva.StorageHome.MountID, Destination: &cfg.Reva.StorageHome.MountID,
storage/pkg/flagset/storageusers.go
+1 -1
View File
@@ -82,7 +82,7 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag {
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "mount-id", Name: "mount-id",
Value: "1284d238-aa92-42ce-bdc4-0b0000009162", // /users Value: "1284d238-aa92-42ce-bdc4-0b0000009157", // /users
Usage: "mount id", Usage: "mount id",
EnvVars: []string{"STORAGE_USERS_MOUNT_ID"}, EnvVars: []string{"STORAGE_USERS_MOUNT_ID"},
Destination: &cfg.Reva.StorageUsers.MountID, Destination: &cfg.Reva.StorageUsers.MountID,