storage-metadata -> storage-system
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
@@ -3,31 +3,31 @@ package command
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/command"
|
||||
"github.com/owncloud/ocis/extensions/storage-system/pkg/command"
|
||||
"github.com/owncloud/ocis/ocis-pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-pkg/config/parser"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
// StorageMetadataCommand is the entrypoint for the StorageMetadata command.
|
||||
func StorageMetadataCommand(cfg *config.Config) *cli.Command {
|
||||
// StorageSystemCommand is the entrypoint for the StorageSystem command.
|
||||
func StorageSystemCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: cfg.StorageMetadata.Service.Name,
|
||||
Usage: subcommandDescription(cfg.StorageMetadata.Service.Name),
|
||||
Name: cfg.StorageSystem.Service.Name,
|
||||
Usage: subcommandDescription(cfg.StorageSystem.Service.Name),
|
||||
Category: "extensions",
|
||||
Before: func(c *cli.Context) error {
|
||||
if err := parser.ParseConfig(cfg); err != nil {
|
||||
fmt.Printf("%v", err)
|
||||
return err
|
||||
}
|
||||
cfg.StorageMetadata.Commons = cfg.Commons
|
||||
cfg.StorageSystem.Commons = cfg.Commons
|
||||
return nil
|
||||
},
|
||||
Subcommands: command.GetCommands(cfg.StorageMetadata),
|
||||
Subcommands: command.GetCommands(cfg.StorageSystem),
|
||||
}
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageMetadataCommand)
|
||||
register.AddCommand(StorageSystemCommand)
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ type OcisConfig struct {
|
||||
AuthBearer AuthbearerExtension `yaml:"auth-bearer"`
|
||||
User UserAndGroupExtension
|
||||
Group UserAndGroupExtension
|
||||
StorageMetadata DataProviderInsecureSettings `yaml:"storage-metadata"`
|
||||
StorageMetadata DataProviderInsecureSettings `yaml:"storage-system"`
|
||||
StorageUsers DataProviderInsecureSettings `yaml:"storage-users"`
|
||||
Ocdav InsecureExtension
|
||||
Thumbnails ThumbNailExtension
|
||||
|
||||
@@ -41,9 +41,9 @@ import (
|
||||
search "github.com/owncloud/ocis/extensions/search/pkg/command"
|
||||
settings "github.com/owncloud/ocis/extensions/settings/pkg/command"
|
||||
sharing "github.com/owncloud/ocis/extensions/sharing/pkg/command"
|
||||
storagemetadata "github.com/owncloud/ocis/extensions/storage-metadata/pkg/command"
|
||||
storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/command"
|
||||
storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/command"
|
||||
storageSystem "github.com/owncloud/ocis/extensions/storage-system/pkg/command"
|
||||
storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/command"
|
||||
store "github.com/owncloud/ocis/extensions/store/pkg/command"
|
||||
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/command"
|
||||
@@ -110,7 +110,7 @@ func NewService(options ...Option) (*Service, error) {
|
||||
|
||||
s.ServicesRegistry[opts.Config.Settings.Service.Name] = settings.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.Nats.Service.Name] = nats.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.StorageMetadata.Service.Name] = storagemetadata.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.StorageSystem.Service.Name] = storageSystem.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.GLAuth.Service.Name] = glauth.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.Graph.Service.Name] = graph.NewSutureService
|
||||
s.ServicesRegistry[opts.Config.GraphExplorer.Service.Name] = graphExplorer.NewSutureService
|
||||
|
||||
Reference in New Issue
Block a user