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

change ocis log level to default and change public link storage mountid mapping

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 001fb868e5
commit dd4c320377
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.star
+1 -1
View File
@@ -1402,7 +1402,7 @@ def ocisServer(storage):
'pull': 'always', 'pull': 'always',
'detach': True, 'detach': True,
'environment' : { 'environment' : {
'OCIS_LOG_LEVEL': 'debug', #'OCIS_LOG_LEVEL': 'debug',
'STORAGE_HOME_DRIVER': '%s' % (storage), 'STORAGE_HOME_DRIVER': '%s' % (storage),
'STORAGE_USERS_DRIVER': '%s' % (storage), 'STORAGE_USERS_DRIVER': '%s' % (storage),
'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users', 'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
storage/pkg/command/gateway.go
+2
View File
@@ -244,6 +244,8 @@ 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,6 +233,14 @@ 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-0b0000009154", // /users Value: "1284d238-aa92-42ce-bdc4-0b0000009162", // /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,