diff --git a/pkg/command/root.go b/pkg/command/root.go index 41ee8b799c..036c5a6979 100644 --- a/pkg/command/root.go +++ b/pkg/command/root.go @@ -85,6 +85,8 @@ func Execute() error { StorageHomeData(cfg), StorageOC(cfg), StorageOCData(cfg), + StorageEOS(cfg), + StorageEOSData(cfg), Health(cfg), }, } diff --git a/pkg/command/storageeos.go b/pkg/command/storageeos.go index 40165d7dd5..04ef99807f 100644 --- a/pkg/command/storageeos.go +++ b/pkg/command/storageeos.go @@ -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, diff --git a/pkg/command/storageeosdata.go b/pkg/command/storageeosdata.go index 50ceab2632..eee78a9253 100644 --- a/pkg/command/storageeosdata.go +++ b/pkg/command/storageeosdata.go @@ -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, },