mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-13 09:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plurals everywhere!

Browse source
This commit is contained in:
Andrew Morgan (https://amorgan.xyz) 2017-12-19 08:52:31 -08:00
parent 3c2cbb5f92
commit d8bae1a0d0
No known key found for this signature in database
GPG key ID: 174BEAB009FD176D
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dendrite-config.yaml
View file

@ -122,5 +122,5 @@ tracing:
disabled: true disabled: true
# A list of application service config files to use # A list of application service config files to use
applicationservice: application_services:
app_service_config_files: [] config_files: []

2
src/github.com/matrix-org/dendrite/common/config/appservice.go
View file

@ -49,7 +49,7 @@ type ApplicationService struct {
func loadAppservices(config *Dendrite) error { func loadAppservices(config *Dendrite) error {
// Iterate through and return all the Application Services // 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 // Create a new application service
var appservice ApplicationService var appservice ApplicationService

6
src/github.com/matrix-org/dendrite/common/config/config.go
View file

@ -208,10 +208,10 @@ type Dendrite struct {
// Application Services // Application Services
// https://matrix.org/docs/spec/application_service/unstable.html // https://matrix.org/docs/spec/application_service/unstable.html
ApplicationService struct { ApplicationServices struct {
// Configuration files for various application services // Configuration files for various application services
ConfigFiles []string `yaml:"app_service_config_files"` ConfigFiles []string `yaml:"config_files"`
} `yaml:"applicationservice"` } `yaml:"application_services"`
// Any information derived from the configuration options for later use. // Any information derived from the configuration options for later use.
Derived struct { Derived struct {