diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-08-13 12:16:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 12:16:37 +0100 |
| commit | 9677a95afc529d1766d487db46965266c6fbaa6a (patch) | |
| tree | d98ccf518a3f8386054f93be4138988def9848be /internal/config/config_eduserver.go | |
| parent | 820c56c165ec8f0409d23cd151a7ff89fbe09ffa (diff) | |
API setup refactoring (#1266)
* Start HTTP endpoint refactoring
* Update SetupAndServeHTTP
* Fix builds
* Don't set up external listener if no address configured
* TLS HTTP setup
* Break apart client/federation/key/media muxes
* Tweaks
* Fix P2P demos
* Fix media API routing
* Review comments @Kegsay
* Update sample config
* Fix gobind build
* Fix External -> Public in federation API test
Diffstat (limited to 'internal/config/config_eduserver.go')
| -rw-r--r-- | internal/config/config_eduserver.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/internal/config/config_eduserver.go b/internal/config/config_eduserver.go index 02743041..a2ff3697 100644 --- a/internal/config/config_eduserver.go +++ b/internal/config/config_eduserver.go @@ -3,16 +3,15 @@ package config type EDUServer struct { Matrix *Global `yaml:"-"` - Listen Address `yaml:"listen"` - Bind Address `yaml:"bind"` + InternalAPI InternalAPIOptions `yaml:"internal_api"` } func (c *EDUServer) Defaults() { - c.Listen = "localhost:7778" - c.Bind = "localhost:7778" + c.InternalAPI.Listen = "http://localhost:7778" + c.InternalAPI.Connect = "http://localhost:7778" } func (c *EDUServer) Verify(configErrs *ConfigErrors, isMonolith bool) { - checkNotEmpty(configErrs, "edu_server.listen", string(c.Listen)) - checkNotEmpty(configErrs, "edu_server.bind", string(c.Bind)) + checkURL(configErrs, "edu_server.internal_api.listen", string(c.InternalAPI.Listen)) + checkURL(configErrs, "edu_server.internal_api.connect", string(c.InternalAPI.Connect)) } |