diff --git a/dendrite-config.yaml b/dendrite-config.yaml index d5e0a6369..7c7b9bf05 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -122,5 +122,5 @@ tracing: disabled: true # A list of application service config files to use -applicationservice: - app_service_config_files: [] +application_services: + config_files: [] diff --git a/src/github.com/matrix-org/dendrite/common/config/appservice.go b/src/github.com/matrix-org/dendrite/common/config/appservice.go index 217c11967..3dc3cd662 100644 --- a/src/github.com/matrix-org/dendrite/common/config/appservice.go +++ b/src/github.com/matrix-org/dendrite/common/config/appservice.go @@ -49,7 +49,7 @@ type ApplicationService struct { func loadAppservices(config *Dendrite) error { // Iterate through and return all the Application Services - for _, configPath := range config.ApplicationService.ConfigFiles { + for _, configPath := range config.ApplicationServices.ConfigFiles { // Create a new application service var appservice ApplicationService diff --git a/src/github.com/matrix-org/dendrite/common/config/config.go b/src/github.com/matrix-org/dendrite/common/config/config.go index f1f89b145..7a7f2b48d 100644 --- a/src/github.com/matrix-org/dendrite/common/config/config.go +++ b/src/github.com/matrix-org/dendrite/common/config/config.go @@ -208,10 +208,10 @@ type Dendrite struct { // Application Services // https://matrix.org/docs/spec/application_service/unstable.html - ApplicationService struct { + ApplicationServices struct { // Configuration files for various application services - ConfigFiles []string `yaml:"app_service_config_files"` - } `yaml:"applicationservice"` + ConfigFiles []string `yaml:"config_files"` + } `yaml:"application_services"` // Any information derived from the configuration options for later use. Derived struct {