aboutsummaryrefslogtreecommitdiff
path: root/roomserver/roomserver.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-05-22 11:43:17 +0100
committerGitHub <noreply@github.com>2020-05-22 11:43:17 +0100
commitfe82e1f7255c05e0bc7a7872a53cf2a1a78ffaa0 (patch)
tree84661722411a9098f1925d2a5192e4c40d0a1122 /roomserver/roomserver.go
parentf223da2f35e690e80c6e3d8c1050f0984ab33a2f (diff)
Separate muxes for public and internal APIs (#1056)
* Separate muxes for public and internal APIs * Update client-api-proxy and federation-api-proxy so they don't add /api to the path * Tidy up * Consistent HTTP setup * Set up prefixes properly
Diffstat (limited to 'roomserver/roomserver.go')
-rw-r--r--roomserver/roomserver.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go
index 07250e7c..82934d50 100644
--- a/roomserver/roomserver.go
+++ b/roomserver/roomserver.go
@@ -15,8 +15,6 @@
package roomserver
import (
- "net/http"
-
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib"
@@ -51,9 +49,7 @@ func SetupRoomServerComponent(
KeyRing: keyRing,
}
- if base.EnableHTTPAPIs {
- internalAPI.SetupHTTP(http.DefaultServeMux)
- }
+ internalAPI.SetupHTTP(base.InternalAPIMux)
return &internalAPI
}