diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 968019372..da0b57e62 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -19,6 +19,7 @@ import ( notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config" ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config" search "github.com/owncloud/ocis/v2/services/search/pkg/config" settings "github.com/owncloud/ocis/v2/services/settings/pkg/config" @@ -76,33 +77,34 @@ type Config struct { AdminUserID string `yaml:"admin_user_id" env:"OCIS_ADMIN_USER_ID" desc:"ID of a user, that should receive admin privileges."` Runtime Runtime `yaml:"runtime"` - AppProvider *appProvider.Config `yaml:"app_provider"` - AppRegistry *appRegistry.Config `yaml:"app_registry"` - Audit *audit.Config `yaml:"audit"` - AuthBasic *authbasic.Config `yaml:"auth_basic"` - AuthBearer *authbearer.Config `yaml:"auth_bearer"` - AuthMachine *authmachine.Config `yaml:"auth_machine"` - Frontend *frontend.Config `yaml:"frontend"` - Gateway *gateway.Config `yaml:"gateway"` - Graph *graph.Config `yaml:"graph"` - Groups *groups.Config `yaml:"groups"` - IDM *idm.Config `yaml:"idm"` - IDP *idp.Config `yaml:"idp"` - Nats *nats.Config `yaml:"nats"` - Notifications *notifications.Config `yaml:"notifications"` - OCDav *ocdav.Config `yaml:"ocdav"` - OCS *ocs.Config `yaml:"ocs"` - Proxy *proxy.Config `yaml:"proxy"` - Settings *settings.Config `yaml:"settings"` - Sharing *sharing.Config `yaml:"sharing"` - StorageSystem *storagesystem.Config `yaml:"storage_system"` - StoragePublicLink *storagepublic.Config `yaml:"storage_public"` - StorageShares *storageshares.Config `yaml:"storage_shares"` - StorageUsers *storageusers.Config `yaml:"storage_users"` - Store *store.Config `yaml:"store"` - Thumbnails *thumbnails.Config `yaml:"thumbnails"` - Users *users.Config `yaml:"users"` - Web *web.Config `yaml:"web"` - WebDAV *webdav.Config `yaml:"webdav"` - Search *search.Config `yaml:"search"` + AppProvider *appProvider.Config `yaml:"app_provider"` + AppRegistry *appRegistry.Config `yaml:"app_registry"` + Audit *audit.Config `yaml:"audit"` + AuthBasic *authbasic.Config `yaml:"auth_basic"` + AuthBearer *authbearer.Config `yaml:"auth_bearer"` + AuthMachine *authmachine.Config `yaml:"auth_machine"` + Frontend *frontend.Config `yaml:"frontend"` + Gateway *gateway.Config `yaml:"gateway"` + Graph *graph.Config `yaml:"graph"` + Groups *groups.Config `yaml:"groups"` + IDM *idm.Config `yaml:"idm"` + IDP *idp.Config `yaml:"idp"` + Nats *nats.Config `yaml:"nats"` + Notifications *notifications.Config `yaml:"notifications"` + OCDav *ocdav.Config `yaml:"ocdav"` + OCS *ocs.Config `yaml:"ocs"` + Postprocessing *postprocessing.Config `yaml:"postprocessing"` + Proxy *proxy.Config `yaml:"proxy"` + Settings *settings.Config `yaml:"settings"` + Sharing *sharing.Config `yaml:"sharing"` + StorageSystem *storagesystem.Config `yaml:"storage_system"` + StoragePublicLink *storagepublic.Config `yaml:"storage_public"` + StorageShares *storageshares.Config `yaml:"storage_shares"` + StorageUsers *storageusers.Config `yaml:"storage_users"` + Store *store.Config `yaml:"store"` + Thumbnails *thumbnails.Config `yaml:"thumbnails"` + Users *users.Config `yaml:"users"` + Web *web.Config `yaml:"web"` + WebDAV *webdav.Config `yaml:"webdav"` + Search *search.Config `yaml:"search"` } diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 261db77b4..b9f959223 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -17,6 +17,7 @@ import ( notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults" ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults" ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults" + postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" search "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" settings "github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults" @@ -56,6 +57,7 @@ func DefaultConfig() *Config { Notifications: notifications.DefaultConfig(), OCDav: ocdav.DefaultConfig(), OCS: ocs.DefaultConfig(), + Postprocessing: postprocessing.DefaultConfig(), Proxy: proxy.DefaultConfig(), Search: search.FullDefaultConfig(), Settings: settings.DefaultConfig(), diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index f809b2d34..f05e5fc20 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -34,6 +34,7 @@ import ( notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command" + postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command" search "github.com/owncloud/ocis/v2/services/search/pkg/command" settings "github.com/owncloud/ocis/v2/services/settings/pkg/command" @@ -125,6 +126,7 @@ func NewService(options ...Option) (*Service, error) { s.ServicesRegistry[opts.Config.AppProvider.Service.Name] = appProvider.NewSutureService s.ServicesRegistry[opts.Config.Notifications.Service.Name] = notifications.NewSutureService s.ServicesRegistry[opts.Config.Search.Service.Name] = search.NewSutureService + s.ServicesRegistry[opts.Config.Postprocessing.Service.Name] = postprocessing.NewSutureService // populate delayed services s.Delayed[opts.Config.Sharing.Service.Name] = sharing.NewSutureService @@ -262,7 +264,7 @@ func (s *Service) generateRunSet(cfg *ociscfg.Config) { } // List running processes for the Service Controller. -func (s *Service) List(args struct{}, reply *string) error { +func (s *Service) List(_ struct{}, reply *string) error { tableString := &strings.Builder{} table := tablewriter.NewWriter(tableString) table.SetHeader([]string{"Service"})