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 /cmd/syncserver-integration-tests | |
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 'cmd/syncserver-integration-tests')
-rw-r--r-- | cmd/syncserver-integration-tests/main.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/syncserver-integration-tests/main.go b/cmd/syncserver-integration-tests/main.go index bba8fd96..a11dd2a0 100644 --- a/cmd/syncserver-integration-tests/main.go +++ b/cmd/syncserver-integration-tests/main.go @@ -133,7 +133,8 @@ func startSyncServer() (*exec.Cmd, chan error) { } // TODO use the address assigned by the config generator rather than clobbering. cfg.Global.ServerName = "localhost" - cfg.SyncAPI.Listen = config.Address(syncserverAddr) + cfg.SyncAPI.InternalAPI.Listen = config.HTTPAddress("http://" + syncserverAddr) + cfg.SyncAPI.InternalAPI.Connect = cfg.SyncAPI.InternalAPI.Listen if err := test.WriteConfig(cfg, dir); err != nil { panic(err) |