patch dendrite microservices with bind config

Adds bind block to the dendrite config.
microservices bind to address in this block, and talk to other microservices via the address in the listen block

cmd/dendrite-appservice-server/main.go

@@ -35,5 +35,5 @@ func main() {
 		base, accountDB, deviceDB, federation, alias, query, cache,
 	)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
 }

cmd/dendrite-client-api-server/main.go

@@ -44,5 +44,5 @@ func main() {
 		alias, input, query, typingInputAPI, asQuery, transactions.New(),
 	)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.ClientAPI))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.ClientAPI))
 }

cmd/dendrite-federation-api-server/main.go

@@ -39,5 +39,5 @@ func main() {
 		alias, input, query, asQuery,
 	)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationAPI))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI))
 }

cmd/dendrite-federation-sender-server/main.go

@@ -32,5 +32,5 @@ func main() {
 		base, federation, query,
 	)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
 }

cmd/dendrite-media-api-server/main.go

@@ -28,5 +28,5 @@ func main() {
 
 	mediaapi.SetupMediaAPIComponent(base, deviceDB)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.MediaAPI))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI))
 }

cmd/dendrite-public-rooms-api-server/main.go

@@ -28,5 +28,5 @@ func main() {
 
 	publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.PublicRoomsAPI))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI))
 }

cmd/dendrite-room-server/main.go

@@ -28,5 +28,5 @@ func main() {
 
 	roomserver.SetupRoomServerComponent(base)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.RoomServer))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer))
 }

cmd/dendrite-sync-api-server/main.go

@@ -31,5 +31,5 @@ func main() {
 
 	syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query)
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.SyncAPI))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.SyncAPI))
 }

cmd/dendrite-typing-server/main.go

@@ -32,5 +32,5 @@ func main() {
 
 	typingserver.SetupTypingServerComponent(base, cache.NewTypingCache())
 
-	base.SetupAndServeHTTP(string(base.Cfg.Listen.TypingServer))
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.TypingServer))
 }

common/config/config.go

@@ -194,8 +194,7 @@ type Dendrite struct {
 		Password string `yaml:"turn_password"`
 	} `yaml:"turn"`
 
-	// The internal addresses the components will listen on.
+	// The addresses for talking to other microservices.
-	// These should not be exposed externally as they expose metrics and debugging APIs.
 	Listen struct {
 		MediaAPI         Address `yaml:"media_api"`
 		ClientAPI        Address `yaml:"client_api"`
@@ -208,6 +207,20 @@ type Dendrite struct {
 		TypingServer     Address `yaml:"typing_server"`
 	} `yaml:"listen"`
 
+	// The internal addresses the components will listen on.
+	// These should not be exposed externally as they expose metrics and debugging APIs.
+	Bind struct {
+		MediaAPI         Address `yaml:"media_api"`
+		ClientAPI        Address `yaml:"client_api"`
+		FederationAPI    Address `yaml:"federation_api"`
+		AppServiceAPI    Address `yaml:"appservice_api"`
+		SyncAPI          Address `yaml:"sync_api"`
+		RoomServer       Address `yaml:"room_server"`
+		FederationSender Address `yaml:"federation_sender"`
+		PublicRoomsAPI   Address `yaml:"public_rooms_api"`
+		TypingServer     Address `yaml:"typing_server"`
+	} `yaml:"bind"`
+
 	// The config for tracing the dendrite servers.
 	Tracing struct {
 		// The config for the jaeger opentracing reporter.