Merge branch 'master' into search

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-04-14 11:56:26 +00:00
972 changed files with 2895 additions and 2949 deletions
+18 -18
View File
@@ -1,24 +1,24 @@
package config
import (
accounts "github.com/owncloud/ocis/accounts/pkg/config/defaults"
audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
glauth "github.com/owncloud/ocis/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/graph/pkg/config/defaults"
idm "github.com/owncloud/ocis/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/notifications/pkg/config/defaults"
ocs "github.com/owncloud/ocis/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/settings/pkg/config/defaults"
storage "github.com/owncloud/ocis/storage/pkg/config/defaults"
store "github.com/owncloud/ocis/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
web "github.com/owncloud/ocis/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/extensions/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults"
store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
)
func DefaultConfig() *Config {