From ff3009ffdda4bce3bc0357209ebe1e12a8593a84 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Thu, 18 May 2017 11:32:30 +0200 Subject: [PATCH] cmd/dendrite-media-api-server: Add SERVER_NAME configuration --- .../dendrite/cmd/dendrite-media-api-server/main.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go index d00bbd49c..58191a8c2 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go @@ -22,6 +22,7 @@ import ( "github.com/matrix-org/dendrite/mediaapi/config" "github.com/matrix-org/dendrite/mediaapi/routing" "github.com/matrix-org/dendrite/mediaapi/storage" + "github.com/matrix-org/dendrite/mediaapi/types" log "github.com/Sirupsen/logrus" ) @@ -30,6 +31,7 @@ var ( bindAddr = os.Getenv("BIND_ADDRESS") dataSource = os.Getenv("DATABASE") logDir = os.Getenv("LOG_DIR") + serverName = os.Getenv("SERVER_NAME") ) func main() { @@ -39,8 +41,12 @@ func main() { log.Panic("No BIND_ADDRESS environment variable found.") } + if serverName == "" { + serverName = "localhost" + } + cfg := &config.MediaAPI{ - ServerName: "localhost", + ServerName: types.ServerName(serverName), BasePath: "/Users/robertsw/dendrite", MaxFileSize: 10 * 1024 * 1024, DataSource: dataSource,