mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-11 11:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable EOS storage commands on ocis-reva (#150)

Browse Source 
* EOS storage: remove not needed configs

* Add EOS storage commands

Co-authored-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Diogo Castro
2020-04-29 15:54:19 +02:00
committed by GitHub
parent 75cac941b6
commit 3ba73ed2ec
3 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/command/root.go
View File

@@ -85,6 +85,8 @@ func Execute() error {
StorageHomeData(cfg),
StorageOC(cfg),
StorageOCData(cfg),
StorageEOS(cfg),
StorageEOSData(cfg),
Health(cfg),
},
}

18
pkg/command/storageeos.go
View File

@@ -108,24 +108,6 @@ func StorageEOS(cfg *config.Config) *cli.Command {
"enable_home": cfg.Reva.Storages.EOS.EnableHome,
"user_layout": cfg.Reva.Storages.EOS.Layout,
},
"local": map[string]interface{}{
"root": cfg.Reva.Storages.Local.Root,
},
"owncloud": map[string]interface{}{
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
"scan": cfg.Reva.Storages.OwnCloud.Scan,
"redis": cfg.Reva.Storages.OwnCloud.Redis,
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
},
"s3": map[string]interface{}{
"region": cfg.Reva.Storages.S3.Region,
"access_key": cfg.Reva.Storages.S3.AccessKey,
"secret_key": cfg.Reva.Storages.S3.SecretKey,
"endpoint": cfg.Reva.Storages.S3.Endpoint,
"bucket": cfg.Reva.Storages.S3.Bucket,
"prefix": cfg.Reva.Storages.S3.Prefix,
},
},
"mount_path": cfg.Reva.StorageEOS.MountPath,
"mount_id": cfg.Reva.StorageEOS.MountID,

22
pkg/command/storageeosdata.go
View File

@@ -19,8 +19,8 @@ import (
// StorageEOSData is the entrypoint for the storage-oc-data command.
func StorageEOSData(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "storage-oc-data",
Usage: "Start reva storage-oc-data service",
Name: "storage-eos-data",
Usage: "Start reva storage-eos-data service",
Flags: flagset.StorageEOSDataWithConfig(cfg),
Before: func(c *cli.Context) error {
cfg.Reva.StorageEOSData.Services = c.StringSlice("service")
@@ -110,24 +110,6 @@ func StorageEOSData(cfg *config.Config) *cli.Command {
"enable_home": cfg.Reva.Storages.EOS.EnableHome,
"user_layout": cfg.Reva.Storages.EOS.Layout,
},
"local": map[string]interface{}{
"root": cfg.Reva.Storages.Local.Root,
},
"owncloud": map[string]interface{}{
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
"scan": cfg.Reva.Storages.OwnCloud.Scan,
"redis": cfg.Reva.Storages.OwnCloud.Redis,
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
},
"s3": map[string]interface{}{
"region": cfg.Reva.Storages.S3.Region,
"access_key": cfg.Reva.Storages.S3.AccessKey,
"secret_key": cfg.Reva.Storages.S3.SecretKey,
"endpoint": cfg.Reva.Storages.S3.Endpoint,
"bucket": cfg.Reva.Storages.S3.Bucket,
"prefix": cfg.Reva.Storages.S3.Prefix,
},
},
"temp_folder": cfg.Reva.StorageEOSData.TempFolder,
},