aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-04 16:26:35 +0100
committerGitHub <noreply@github.com>2020-06-04 16:26:35 +0100
commit2bd12f635cef281ab0d497c9e1bafe92247d88d5 (patch)
tree3d99154f8505915890bb6233591a77e2d8b5213b /cmd
parent9834ac97db042b0c78fbd72652aa534129ca3afe (diff)
Convert serverkeys to inthttp (#1097)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/dendrite-client-api-server/main.go2
-rw-r--r--cmd/dendrite-federation-api-server/main.go2
-rw-r--r--cmd/dendrite-federation-sender-server/main.go2
-rw-r--r--cmd/dendrite-monolith-server/main.go2
-rw-r--r--cmd/dendrite-room-server/main.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go
index ba8e6af7..2eec84ab 100644
--- a/cmd/dendrite-client-api-server/main.go
+++ b/cmd/dendrite-client-api-server/main.go
@@ -32,7 +32,7 @@ func main() {
deviceDB := base.CreateDeviceDB()
federation := base.CreateFederationClient()
- serverKeyAPI := base.CreateHTTPServerKeyAPIs()
+ serverKeyAPI := base.ServerKeyAPIClient()
keyRing := serverKeyAPI.KeyRing()
asQuery := base.AppserviceHTTPClient()
diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go
index aca6ba57..604dd4e3 100644
--- a/cmd/dendrite-federation-api-server/main.go
+++ b/cmd/dendrite-federation-api-server/main.go
@@ -31,7 +31,7 @@ func main() {
deviceDB := base.CreateDeviceDB()
federation := base.CreateFederationClient()
- serverKeyAPI := base.CreateHTTPServerKeyAPIs()
+ serverKeyAPI := base.ServerKeyAPIClient()
keyRing := serverKeyAPI.KeyRing()
fsAPI := base.FederationSenderHTTPClient()
diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go
index 14524dca..aeaa837d 100644
--- a/cmd/dendrite-federation-sender-server/main.go
+++ b/cmd/dendrite-federation-sender-server/main.go
@@ -26,7 +26,7 @@ func main() {
federation := base.CreateFederationClient()
- serverKeyAPI := base.CreateHTTPServerKeyAPIs()
+ serverKeyAPI := base.ServerKeyAPIClient()
keyRing := serverKeyAPI.KeyRing()
rsAPI := base.RoomserverHTTPClient()
diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
index ba918925..78919f2b 100644
--- a/cmd/dendrite-monolith-server/main.go
+++ b/cmd/dendrite-monolith-server/main.go
@@ -74,7 +74,7 @@ func main() {
base, federation,
)
if base.UseHTTPAPIs {
- serverKeyAPI = base.CreateHTTPServerKeyAPIs()
+ serverKeyAPI = base.ServerKeyAPIClient()
}
keyRing := serverKeyAPI.KeyRing()
diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go
index f4da560a..65a1e9ae 100644
--- a/cmd/dendrite-room-server/main.go
+++ b/cmd/dendrite-room-server/main.go
@@ -25,7 +25,7 @@ func main() {
defer base.Close() // nolint: errcheck
federation := base.CreateFederationClient()
- serverKeyAPI := base.CreateHTTPServerKeyAPIs()
+ serverKeyAPI := base.ServerKeyAPIClient()
keyRing := serverKeyAPI.KeyRing()
fsAPI := base.FederationSenderHTTPClient()