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

Undo rename of appservice_api for now

Browse source
This commit is contained in:
Till Faelligen 2022-05-02 13:47:27 +02:00
parent 7f520fc053
commit 5d16e02722
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup/config/config.go
View file

@ -54,7 +54,7 @@ type Dendrite struct {
Version int `yaml:"version"` Version int `yaml:"version"`
Global Global `yaml:"global"` Global Global `yaml:"global"`
AppServiceAPI AppServiceAPI `yaml:"appservice_api"` AppServiceAPI AppServiceAPI `yaml:"app_service_api"`
ClientAPI ClientAPI `yaml:"client_api"` ClientAPI ClientAPI `yaml:"client_api"`
FederationAPI FederationAPI `yaml:"federation_api"` FederationAPI FederationAPI `yaml:"federation_api"`
KeyServer KeyServer `yaml:"key_server"` KeyServer KeyServer `yaml:"key_server"`

6
setup/config/config_appservice.go
View file

@ -50,10 +50,10 @@ func (c *AppServiceAPI) Defaults(generate bool) {
} }
func (c *AppServiceAPI) Verify(configErrs *ConfigErrors, isMonolith bool) { func (c *AppServiceAPI) Verify(configErrs *ConfigErrors, isMonolith bool) {
checkURL(configErrs, "appservice_api.internal_api.listen", string(c.InternalAPI.Listen)) checkURL(configErrs, "app_service_api.internal_api.listen", string(c.InternalAPI.Listen))
checkURL(configErrs, "appservice_api.internal_api.bind", string(c.InternalAPI.Connect)) checkURL(configErrs, "app_service_api.internal_api.bind", string(c.InternalAPI.Connect))
setDatabase(c.Matrix.GlobalDatabaseOptions, &c.Database, "appservice.db") setDatabase(c.Matrix.GlobalDatabaseOptions, &c.Database, "appservice.db")
checkNotEmpty(configErrs, "appservice_api.database.connection_string", string(c.Database.ConnectionString)) checkNotEmpty(configErrs, "app_service_api.database.connection_string", string(c.Database.ConnectionString))
} }
// ApplicationServiceNamespace is the namespace that a specific application // ApplicationServiceNamespace is the namespace that a specific application

2
setup/config/config_test.go
View file

@ -63,7 +63,7 @@ global:
display_name: "Server alerts" display_name: "Server alerts"
avatar: "" avatar: ""
room_name: "Server Alerts" room_name: "Server Alerts"
appservice_api: app_service_api:
internal_api: internal_api:
listen: http://localhost:7777 listen: http://localhost:7777
connect: http://localhost:7777 connect: http://localhost:7777