From 5d16e02722afec718ef747991a13d4c54ffb28ad Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 2 May 2022 13:47:27 +0200 Subject: [PATCH] Undo rename of appservice_api for now --- setup/config/config.go | 2 +- setup/config/config_appservice.go | 6 +++--- setup/config/config_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/config/config.go b/setup/config/config.go index e236de575..65bea2887 100644 --- a/setup/config/config.go +++ b/setup/config/config.go @@ -54,7 +54,7 @@ type Dendrite struct { Version int `yaml:"version"` Global Global `yaml:"global"` - AppServiceAPI AppServiceAPI `yaml:"appservice_api"` + AppServiceAPI AppServiceAPI `yaml:"app_service_api"` ClientAPI ClientAPI `yaml:"client_api"` FederationAPI FederationAPI `yaml:"federation_api"` KeyServer KeyServer `yaml:"key_server"` diff --git a/setup/config/config_appservice.go b/setup/config/config_appservice.go index 98fb355b3..679f160a3 100644 --- a/setup/config/config_appservice.go +++ b/setup/config/config_appservice.go @@ -50,10 +50,10 @@ func (c *AppServiceAPI) Defaults(generate bool) { } func (c *AppServiceAPI) Verify(configErrs *ConfigErrors, isMonolith bool) { - checkURL(configErrs, "appservice_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.listen", string(c.InternalAPI.Listen)) + checkURL(configErrs, "app_service_api.internal_api.bind", string(c.InternalAPI.Connect)) 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 diff --git a/setup/config/config_test.go b/setup/config/config_test.go index e1ed76e3f..df60ba0f4 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -63,7 +63,7 @@ global: display_name: "Server alerts" avatar: "" room_name: "Server Alerts" -appservice_api: +app_service_api: internal_api: listen: http://localhost:7777 connect: http://localhost:7777