diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-08-21 11:01:30 +0100 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-08-21 11:01:30 +0100 |
| commit | 10461b8870cbddb28f6c1d5103ba18483ca0412c (patch) | |
| tree | a94ce527754988524ad9bdef1783a5e12e31720c /cmd | |
| parent | 9d53351dc20283103bf2eec6b92831033d06c5a8 (diff) | |
Fix embedding Element Web into demo-libp2p and demo-yggdrasil
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dendrite-demo-libp2p/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-demo-yggdrasil/main.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index 78b6e477..4934fe5f 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -28,6 +28,7 @@ import ( p2phttp "github.com/libp2p/go-libp2p-http" p2pdisc "github.com/libp2p/go-libp2p/p2p/discovery" "github.com/matrix-org/dendrite/appservice" + "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/embed" "github.com/matrix-org/dendrite/currentstateserver" "github.com/matrix-org/dendrite/eduserver" "github.com/matrix-org/dendrite/federationsender" @@ -202,6 +203,7 @@ func main() { httpRouter.PathPrefix(httputil.InternalPathPrefix).Handler(base.Base.InternalAPIMux) httpRouter.PathPrefix(httputil.PublicClientPathPrefix).Handler(base.Base.PublicClientAPIMux) httpRouter.PathPrefix(httputil.PublicMediaPathPrefix).Handler(base.Base.PublicMediaAPIMux) + embed.Embed(httpRouter, *instancePort, "Yggdrasil Demo") libp2pRouter := mux.NewRouter().SkipClean(true).UseEncodedPath() libp2pRouter.PathPrefix(httputil.PublicFederationPathPrefix).Handler(base.Base.PublicFederationAPIMux) diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index f62b0627..e8745b3e 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -133,8 +133,6 @@ func main() { rsComponent.SetFederationSenderAPI(fsAPI) - embed.Embed(base.PublicClientAPIMux, *instancePort, "Yggdrasil Demo") - monolith := setup.Monolith{ Config: base.Cfg, AccountDB: accountDB, @@ -167,6 +165,7 @@ func main() { httpRouter.PathPrefix(httputil.InternalPathPrefix).Handler(base.InternalAPIMux) httpRouter.PathPrefix(httputil.PublicClientPathPrefix).Handler(base.PublicClientAPIMux) httpRouter.PathPrefix(httputil.PublicMediaPathPrefix).Handler(base.PublicMediaAPIMux) + embed.Embed(httpRouter, *instancePort, "Yggdrasil Demo") yggRouter := mux.NewRouter().SkipClean(true).UseEncodedPath() yggRouter.PathPrefix(httputil.PublicFederationPathPrefix).Handler(base.PublicFederationAPIMux) |