make frontend config similar to other services
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/extensions/storage/pkg/command"
|
||||
"github.com/owncloud/ocis/extensions/frontend/pkg/command"
|
||||
"github.com/owncloud/ocis/ocis-pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/urfave/cli/v2"
|
||||
@@ -14,11 +14,11 @@ func StorageFrontendCommand(cfg *config.Config) *cli.Command {
|
||||
Usage: "start storage frontend",
|
||||
Category: "extensions",
|
||||
//Flags: flagset.FrontendWithConfig(cfg.Storage),
|
||||
Before: func(ctx *cli.Context) error {
|
||||
return ParseStorageCommon(ctx, cfg)
|
||||
},
|
||||
// Before: func(ctx *cli.Context) error {
|
||||
// return ParseStorageCommon(ctx, cfg)
|
||||
// },
|
||||
Action: func(c *cli.Context) error {
|
||||
origCmd := command.Frontend(cfg.Storage)
|
||||
origCmd := command.Frontend(cfg.Frontend)
|
||||
return handleOriginalAction(c, origCmd)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ import (
|
||||
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command"
|
||||
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command"
|
||||
authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
|
||||
frontend "github.com/owncloud/ocis/extensions/frontend/pkg/command"
|
||||
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
|
||||
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command"
|
||||
graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
|
||||
@@ -118,7 +119,7 @@ func NewService(options ...Option) (*Service, error) {
|
||||
s.ServicesRegistry["thumbnails"] = thumbnails.NewSutureService
|
||||
s.ServicesRegistry["web"] = web.NewSutureService
|
||||
s.ServicesRegistry["webdav"] = webdav.NewSutureService
|
||||
s.ServicesRegistry["storage-frontend"] = storage.NewFrontend
|
||||
s.ServicesRegistry["storage-frontend"] = frontend.NewFrontend
|
||||
s.ServicesRegistry["ocdav"] = ocdav.NewOCDav
|
||||
s.ServicesRegistry["storage-gateway"] = storage.NewGateway
|
||||
s.ServicesRegistry["storage-userprovider"] = user.NewUserProvider
|
||||
|
||||
Reference in New Issue
Block a user