fix sharing

owncloud · Oct 11, 2021 · 37294fd · 37294fd
1 parent fa80833
commit 37294fd
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 56 deletions.
diff --git a/storage/pkg/command/storagedrivers/home.go b/storage/pkg/command/storagedrivers/home.go
@@ -0,0 +1,130 @@
+package storagedrivers
+
+import (
+	"github.com/owncloud/ocis/storage/pkg/config"
+)
+
+func HomeDrivers(cfg *config.Config) map[string]interface{} {
+	return map[string]interface{}{
+		"eos": map[string]interface{}{
+			"namespace":              cfg.Reva.UserStorage.EOS.Root,
+			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
+			"uploads_namespace":      cfg.Reva.UserStorage.EOS.UploadsNamespace,
+			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
+			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
+			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
+			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
+			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
+			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
+			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
+			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
+			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
+		},
+		"eoshome": map[string]interface{}{
+			"namespace":              cfg.Reva.UserStorage.EOS.Root,
+			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
+			"uploads_namespace":      cfg.Reva.UserStorage.EOS.UploadsNamespace,
+			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
+			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
+			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
+			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
+			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
+			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
+			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
+			"user_layout":            cfg.Reva.UserStorage.EOS.UserLayout,
+			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
+			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
+		},
+		"eosgrpc": map[string]interface{}{
+			"namespace":              cfg.Reva.UserStorage.EOS.Root,
+			"shadow_namespace":       cfg.Reva.UserStorage.EOS.ShadowNamespace,
+			"share_folder":           cfg.Reva.UserStorage.EOS.ShareFolder,
+			"eos_binary":             cfg.Reva.UserStorage.EOS.EosBinary,
+			"xrdcopy_binary":         cfg.Reva.UserStorage.EOS.XrdcopyBinary,
+			"master_url":             cfg.Reva.UserStorage.EOS.MasterURL,
+			"master_grpc_uri":        cfg.Reva.UserStorage.EOS.GrpcURI,
+			"slave_url":              cfg.Reva.UserStorage.EOS.SlaveURL,
+			"cache_directory":        cfg.Reva.UserStorage.EOS.CacheDirectory,
+			"sec_protocol":           cfg.Reva.UserStorage.EOS.SecProtocol,
+			"keytab":                 cfg.Reva.UserStorage.EOS.Keytab,
+			"single_username":        cfg.Reva.UserStorage.EOS.SingleUsername,
+			"user_layout":            cfg.Reva.UserStorage.EOS.UserLayout,
+			"enable_logging":         cfg.Reva.UserStorage.EOS.EnableLogging,
+			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
+			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
+			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
+			"enable_home":            cfg.Reva.UserStorage.EOS.EnableHome,
+			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
+		},
+		"local": map[string]interface{}{
+			"root":         cfg.Reva.UserStorage.Local.Root,
+			"share_folder": cfg.Reva.UserStorage.Local.ShareFolder,
+		},
+		"localhome": map[string]interface{}{
+			"root":         cfg.Reva.UserStorage.Local.Root,
+			"share_folder": cfg.Reva.UserStorage.Local.ShareFolder,
+			"user_layout":  cfg.Reva.UserStorage.Local.UserLayout,
+		},
+		"owncloud": map[string]interface{}{
+			"datadirectory":   cfg.Reva.UserStorage.OwnCloud.Root,
+			"upload_info_dir": cfg.Reva.UserStorage.OwnCloud.UploadInfoDir,
+			"sharedirectory":  cfg.Reva.UserStorage.OwnCloud.ShareFolder,
+			"user_layout":     cfg.Reva.UserStorage.OwnCloud.UserLayout,
+			"redis":           cfg.Reva.UserStorage.OwnCloud.Redis,
+			"enable_home":     cfg.Reva.UserStorage.OwnCloud.EnableHome,
+			"scan":            cfg.Reva.UserStorage.OwnCloud.Scan,
+			"userprovidersvc": cfg.Reva.Users.Endpoint,
+		},
+		"owncloudsql": map[string]interface{}{
+			"datadirectory":   cfg.Reva.UserStorage.OwnCloudSQL.Root,
+			"upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir,
+			"sharedirectory":  cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
+			"user_layout":     cfg.Reva.UserStorage.OwnCloudSQL.UserLayout,
+			"enable_home":     cfg.Reva.UserStorage.OwnCloudSQL.EnableHome,
+			"dbusername":      cfg.Reva.UserStorage.OwnCloudSQL.DBUsername,
+			"dbpassword":      cfg.Reva.UserStorage.OwnCloudSQL.DBPassword,
+			"dbhost":          cfg.Reva.UserStorage.OwnCloudSQL.DBHost,
+			"dbport":          cfg.Reva.UserStorage.OwnCloudSQL.DBPort,
+			"dbname":          cfg.Reva.UserStorage.OwnCloudSQL.DBName,
+			"userprovidersvc": cfg.Reva.Users.Endpoint,
+		},
+		"ocis": map[string]interface{}{
+			"root":                cfg.Reva.UserStorage.OCIS.Root,
+			"enable_home":         cfg.Reva.UserStorage.OCIS.EnableHome,
+			"user_layout":         cfg.Reva.UserStorage.OCIS.UserLayout,
+			"share_folder":        cfg.Reva.UserStorage.OCIS.ShareFolder,
+			"treetime_accounting": true,
+			"treesize_accounting": true,
+			"owner":               cfg.Reva.UserStorage.OCIS.ServiceUserUUID, // the accounts service system account uuid
+		},
+		"s3": map[string]interface{}{
+			"region":     cfg.Reva.UserStorage.S3.Region,
+			"access_key": cfg.Reva.UserStorage.S3.AccessKey,
+			"secret_key": cfg.Reva.UserStorage.S3.SecretKey,
+			"endpoint":   cfg.Reva.UserStorage.S3.Endpoint,
+			"bucket":     cfg.Reva.UserStorage.S3.Bucket,
+			"prefix":     cfg.Reva.UserStorage.S3.Root,
+		},
+		"s3ng": map[string]interface{}{
+			"root":          cfg.Reva.UserStorage.S3NG.Root,
+			"enable_hos":    cfg.Reva.UserStorage.S3NG.EnableHome,
+			"user_layout":   cfg.Reva.UserStorage.S3NG.UserLayout,
+			"share_folder":  cfg.Reva.UserStorage.S3NG.ShareFolder,
+			"s3.region":     cfg.Reva.UserStorage.S3NG.Region,
+			"s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey,
+			"s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey,
+			"s3.endpoint":   cfg.Reva.UserStorage.S3NG.Endpoint,
+			"s3.bucket":     cfg.Reva.UserStorage.S3NG.Bucket,
+		},
+	}
+}
diff --git a/storage/pkg/command/storagedrivers/metadata.go b/storage/pkg/command/storagedrivers/metadata.go
@@ -10,7 +10,6 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"namespace":              cfg.Reva.MetadataStorage.EOS.Root,
 			"shadow_namespace":       cfg.Reva.MetadataStorage.EOS.ShadowNamespace,
 			"uploads_namespace":      cfg.Reva.MetadataStorage.EOS.UploadsNamespace,
-			"share_folder":           cfg.Reva.MetadataStorage.EOS.ShareFolder,
 			"eos_binary":             cfg.Reva.MetadataStorage.EOS.EosBinary,
 			"xrdcopy_binary":         cfg.Reva.MetadataStorage.EOS.XrdcopyBinary,
 			"master_url":             cfg.Reva.MetadataStorage.EOS.MasterURL,
@@ -29,7 +28,6 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"namespace":              cfg.Reva.MetadataStorage.EOS.Root,
 			"shadow_namespace":       cfg.Reva.MetadataStorage.EOS.ShadowNamespace,
 			"uploads_namespace":      cfg.Reva.MetadataStorage.EOS.UploadsNamespace,
-			"share_folder":           cfg.Reva.MetadataStorage.EOS.ShareFolder,
 			"eos_binary":             cfg.Reva.MetadataStorage.EOS.EosBinary,
 			"xrdcopy_binary":         cfg.Reva.MetadataStorage.EOS.XrdcopyBinary,
 			"master_url":             cfg.Reva.MetadataStorage.EOS.MasterURL,
@@ -48,7 +46,6 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 		"eosgrpc": map[string]interface{}{
 			"namespace":              cfg.Reva.MetadataStorage.EOS.Root,
 			"shadow_namespace":       cfg.Reva.MetadataStorage.EOS.ShadowNamespace,
-			"share_folder":           cfg.Reva.MetadataStorage.EOS.ShareFolder,
 			"eos_binary":             cfg.Reva.MetadataStorage.EOS.EosBinary,
 			"xrdcopy_binary":         cfg.Reva.MetadataStorage.EOS.XrdcopyBinary,
 			"master_url":             cfg.Reva.MetadataStorage.EOS.MasterURL,
@@ -67,13 +64,11 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"gatewaysvc":             cfg.Reva.MetadataStorage.EOS.GatewaySVC,
 		},
 		"local": map[string]interface{}{
-			"root":         cfg.Reva.MetadataStorage.Local.Root,
-			"share_folder": cfg.Reva.MetadataStorage.Local.ShareFolder,
+			"root": cfg.Reva.MetadataStorage.Local.Root,
 		},
 		"localhome": map[string]interface{}{
-			"root":         cfg.Reva.MetadataStorage.Local.Root,
-			"share_folder": cfg.Reva.MetadataStorage.Local.ShareFolder,
-			"user_layout":  cfg.Reva.MetadataStorage.Local.UserLayout,
+			"root":        cfg.Reva.MetadataStorage.Local.Root,
+			"user_layout": cfg.Reva.MetadataStorage.Local.UserLayout,
 		},
 		"owncloud": map[string]interface{}{
 			"datadirectory":   cfg.Reva.MetadataStorage.OwnCloud.Root,
@@ -88,7 +83,6 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 		"owncloudsql": map[string]interface{}{
 			"datadirectory":   cfg.Reva.MetadataStorage.OwnCloudSQL.Root,
 			"upload_info_dir": cfg.Reva.MetadataStorage.OwnCloudSQL.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.MetadataStorage.OwnCloudSQL.ShareFolder,
 			"user_layout":     cfg.Reva.MetadataStorage.OwnCloudSQL.UserLayout,
 			"enable_home":     false,
 			"dbusername":      cfg.Reva.MetadataStorage.OwnCloudSQL.DBUsername,

diff --git a/storage/pkg/command/storagedrivers/user.go b/storage/pkg/command/storagedrivers/user.go
@@ -63,7 +63,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 			"show_hidden_sys_files":  cfg.Reva.UserStorage.EOS.ShowHiddenSysFiles,
 			"force_single_user_mode": cfg.Reva.UserStorage.EOS.ForceSingleUserMode,
 			"use_keytab":             cfg.Reva.UserStorage.EOS.UseKeytab,
-			"enable_home":            cfg.Reva.UserStorage.EOS.EnableHome,
+			"enable_home":            false,
 			"gatewaysvc":             cfg.Reva.UserStorage.EOS.GatewaySVC,
 		},
 		"local": map[string]interface{}{
@@ -81,7 +81,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 			"sharedirectory":  cfg.Reva.UserStorage.OwnCloud.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.UserStorage.OwnCloud.Redis,
-			"enable_home":     cfg.Reva.UserStorage.OwnCloud.EnableHome,
+			"enable_home":     false,
 			"scan":            cfg.Reva.UserStorage.OwnCloud.Scan,
 			"userprovidersvc": cfg.Reva.Users.Endpoint,
 		},
@@ -90,7 +90,7 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 			"upload_info_dir": cfg.Reva.UserStorage.OwnCloudSQL.UploadInfoDir,
 			"sharedirectory":  cfg.Reva.UserStorage.OwnCloudSQL.ShareFolder,
 			"user_layout":     cfg.Reva.UserStorage.OwnCloudSQL.UserLayout,
-			"enable_home":     cfg.Reva.UserStorage.OwnCloudSQL.EnableHome,
+			"enable_home":     false,
 			"dbusername":      cfg.Reva.UserStorage.OwnCloudSQL.DBUsername,
 			"dbpassword":      cfg.Reva.UserStorage.OwnCloudSQL.DBPassword,
 			"dbhost":          cfg.Reva.UserStorage.OwnCloudSQL.DBHost,
@@ -100,24 +100,27 @@ func UserDrivers(cfg *config.Config) map[string]interface{} {
 		},
 		"ocis": map[string]interface{}{
 			"root":                cfg.Reva.UserStorage.OCIS.Root,
-			"enable_home":         cfg.Reva.UserStorage.OCIS.EnableHome,
+			"enable_home":         false,
 			"user_layout":         cfg.Reva.UserStorage.OCIS.UserLayout,
+			"share_folder":        cfg.Reva.UserStorage.OCIS.ShareFolder,
 			"treetime_accounting": true,
 			"treesize_accounting": true,
 			"owner":               cfg.Reva.UserStorage.OCIS.ServiceUserUUID, // the accounts service system account uuid
 		},
 		"s3": map[string]interface{}{
-			"region":     cfg.Reva.UserStorage.S3.Region,
-			"access_key": cfg.Reva.UserStorage.S3.AccessKey,
-			"secret_key": cfg.Reva.UserStorage.S3.SecretKey,
-			"endpoint":   cfg.Reva.UserStorage.S3.Endpoint,
-			"bucket":     cfg.Reva.UserStorage.S3.Bucket,
-			"prefix":     cfg.Reva.UserStorage.S3.Root,
+			"enable_home": false,
+			"region":      cfg.Reva.UserStorage.S3.Region,
+			"access_key":  cfg.Reva.UserStorage.S3.AccessKey,
+			"secret_key":  cfg.Reva.UserStorage.S3.SecretKey,
+			"endpoint":    cfg.Reva.UserStorage.S3.Endpoint,
+			"bucket":      cfg.Reva.UserStorage.S3.Bucket,
+			"prefix":      cfg.Reva.UserStorage.S3.Root,
 		},
 		"s3ng": map[string]interface{}{
 			"root":          cfg.Reva.UserStorage.S3NG.Root,
-			"enable_home":   cfg.Reva.UserStorage.S3NG.EnableHome,
+			"enable_home":   false,
 			"user_layout":   cfg.Reva.UserStorage.S3NG.UserLayout,
+			"share_folder":  cfg.Reva.UserStorage.S3NG.ShareFolder,
 			"s3.region":     cfg.Reva.UserStorage.S3NG.Region,
 			"s3.access_key": cfg.Reva.UserStorage.S3NG.AccessKey,
 			"s3.secret_key": cfg.Reva.UserStorage.S3NG.SecretKey,

diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go
@@ -108,7 +108,7 @@ func storageHomeConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
 			"services": map[string]interface{}{
 				"storageprovider": map[string]interface{}{
 					"driver":             cfg.Reva.StorageHome.Driver,
-					"drivers":            storagedrivers.UserDrivers(cfg),
+					"drivers":            storagedrivers.HomeDrivers(cfg),
 					"mount_path":         cfg.Reva.StorageHome.MountPath,
 					"mount_id":           cfg.Reva.StorageHome.MountID,
 					"expose_data_server": cfg.Reva.StorageHome.ExposeDataServer,
@@ -125,7 +125,7 @@ func storageHomeConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
 				"dataprovider": map[string]interface{}{
 					"prefix":      cfg.Reva.StorageHome.HTTPPrefix,
 					"driver":      cfg.Reva.StorageHome.Driver,
-					"drivers":     storagedrivers.UserDrivers(cfg),
+					"drivers":     storagedrivers.HomeDrivers(cfg),
 					"timeout":     86400,
 					"insecure":    true,
 					"disable_tus": false,

diff --git a/storage/pkg/flagset/metadatadrivers/drivereos.go b/storage/pkg/flagset/metadatadrivers/drivereos.go
@@ -93,12 +93,6 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER_EOS_USE_KEYTAB"},
 			Destination: &cfg.Reva.UserStorage.EOS.UseKeytab,
 		},
-		&cli.BoolFlag{
-			Name:        "storage-eos-enable-home",
-			Usage:       "enable the creation of home directories",
-			EnvVars:     []string{"STORAGE_METADATA_DRIVER_EOS_ENABLE_HOME"},
-			Destination: &cfg.Reva.UserStorage.EOS.EnableHome,
-		},
 		&cli.StringFlag{
 			Name:        "storage-eos-sec-protocol",
 			Usage:       "the xrootd security protocol to use between the server and EOS",

diff --git a/storage/pkg/flagset/metadatadrivers/driverocis.go b/storage/pkg/flagset/metadatadrivers/driverocis.go
@@ -16,13 +16,6 @@ func DriverOCISWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OCIS_ROOT"},
 			Destination: &cfg.Reva.MetadataStorage.OCIS.Root,
 		},
-		&cli.BoolFlag{
-			Name:        "storage-ocis-enable-home",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.MetadataStorage.OCIS.EnableHome, false),
-			Usage:       "enable the creation of home storages",
-			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OCIS_ENABLE_HOME"},
-			Destination: &cfg.Reva.MetadataStorage.OCIS.EnableHome,
-		},
 		&cli.StringFlag{
 			Name:        "storage-ocis-layout",
 			Value:       flags.OverrideDefaultString(cfg.Reva.MetadataStorage.OCIS.UserLayout, "{{.Id.OpaqueId}}"),

diff --git a/storage/pkg/flagset/metadatadrivers/driverowncloud.go b/storage/pkg/flagset/metadatadrivers/driverowncloud.go
@@ -44,13 +44,6 @@ func DriverOwnCloudWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OWNCLOUD_REDIS_ADDR"},
 			Destination: &cfg.Reva.MetadataStorage.OwnCloud.Redis,
 		},
-		&cli.BoolFlag{
-			Name:        "storage-owncloud-enable-home",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.MetadataStorage.OwnCloud.EnableHome, false),
-			Usage:       "enable the creation of home storages",
-			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OWNCLOUD_ENABLE_HOME"},
-			Destination: &cfg.Reva.MetadataStorage.OwnCloud.EnableHome,
-		},
 		&cli.StringFlag{
 			Name:        "storage-owncloud-layout",
 			Value:       flags.OverrideDefaultString(cfg.Reva.MetadataStorage.OwnCloud.UserLayout, "{{.Id.OpaqueId}}"),

diff --git a/storage/pkg/flagset/metadatadrivers/driverowncloudsql.go b/storage/pkg/flagset/metadatadrivers/driverowncloudsql.go
@@ -30,13 +30,6 @@ func DriverOwnCloudSQLWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"},
 			Destination: &cfg.Reva.MetadataStorage.OwnCloudSQL.ShareFolder,
 		},
-		&cli.BoolFlag{
-			Name:        "storage-owncloudsql-enable-home",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.MetadataStorage.OwnCloudSQL.EnableHome, false),
-			Usage:       "enable the creation of home storages",
-			EnvVars:     []string{"STORAGE_METADATA_DRIVER_OWNCLOUDSQL_ENABLE_HOME"},
-			Destination: &cfg.Reva.MetadataStorage.OwnCloudSQL.EnableHome,
-		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-layout",
 			Value:       flags.OverrideDefaultString(cfg.Reva.MetadataStorage.OwnCloudSQL.UserLayout, "{{.Username}}"),

diff --git a/storage/pkg/flagset/metadatadrivers/drivers3ng.go b/storage/pkg/flagset/metadatadrivers/drivers3ng.go
@@ -16,13 +16,6 @@ func DriverS3NGWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_METADATA_DRIVER_S3NG_ROOT"},
 			Destination: &cfg.Reva.MetadataStorage.S3NG.Root,
 		},
-		&cli.BoolFlag{
-			Name:        "storage-s3ng-enable-home",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.MetadataStorage.S3NG.EnableHome, false),
-			Usage:       "enable the creation of home storages",
-			EnvVars:     []string{"STORAGE_METADATA_DRIVER_S3NG_ENABLE_HOME"},
-			Destination: &cfg.Reva.MetadataStorage.S3NG.EnableHome,
-		},
 		&cli.StringFlag{
 			Name:        "storage-s3ng-layout",
 			Value:       flags.OverrideDefaultString(cfg.Reva.MetadataStorage.S3NG.UserLayout, "{{.Id.OpaqueId}}"),

diff --git a/storage/pkg/flagset/userdrivers/driverocis.go b/storage/pkg/flagset/userdrivers/driverocis.go
@@ -30,6 +30,13 @@ func DriverOCISWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_USERS_DRIVER_OCIS_LAYOUT"},
 			Destination: &cfg.Reva.UserStorage.OCIS.UserLayout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-ocis-share-folder",
+			Value:       flags.OverrideDefaultString(cfg.Reva.UserStorage.OCIS.ShareFolder, "/Shares"),
+			Usage:       "name of the shares folder",
+			EnvVars:     []string{"STORAGE_USERS_DRIVER_OCIS_SHARE_FOLDER"},
+			Destination: &cfg.Reva.UserStorage.OCIS.ShareFolder,
+		},
 		&cli.StringFlag{
 			Name:        "service-user-uuid",
 			Value:       "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",

diff --git a/storage/pkg/flagset/userdrivers/drivers3ng.go b/storage/pkg/flagset/userdrivers/drivers3ng.go
@@ -30,6 +30,13 @@ func DriverS3NGWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_USERS_DRIVER_S3NG_LAYOUT"},
 			Destination: &cfg.Reva.UserStorage.S3NG.UserLayout,
 		},
+		&cli.StringFlag{
+			Name:        "storage-s3ng-share-folder",
+			Value:       flags.OverrideDefaultString(cfg.Reva.UserStorage.S3NG.ShareFolder, "/Shares"),
+			Usage:       "name of the shares folder",
+			EnvVars:     []string{"STORAGE_USERS_DRIVER_S3NG_SHARE_FOLDER"},
+			Destination: &cfg.Reva.UserStorage.S3NG.ShareFolder,
+		},
 		&cli.StringFlag{
 			Name:        "storage-s3ng-region",
 			Value:       flags.OverrideDefaultString(cfg.Reva.UserStorage.S3NG.Root, "default"),