From c35803c9d8c1df024489166384c87c5a0c7eb4a2 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 7 Aug 2017 13:39:53 +0100 Subject: [PATCH] Add TLS (https) support to the monolithic server (#180) * Add HTTPS listen and serve, and move both listen and serve to goroutines * Add some log so we know the initialisation went well --- .../cmd/dendrite-monolith-server/main.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go index 1a265df7..f0046d7b 100644 --- a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go +++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go @@ -60,6 +60,8 @@ var ( configPath = flag.String("config", "dendrite.yaml", "The path to the config file. For more information, see the config file in this repository.") httpBindAddr = flag.String("http-bind-address", ":8008", "The HTTP listening port for the server") httpsBindAddr = flag.String("https-bind-address", ":8448", "The HTTPS listening port for the server") + certFile = flag.String("tls-cert", "", "The PEM formatted X509 certificate to use for TLS") + keyFile = flag.String("tls-key", "", "The PEM private key to use for TLS") ) func main() { @@ -85,7 +87,20 @@ func main() { m.setupAPIs() // Expose the matrix APIs directly rather than putting them under a /api path. - log.Fatal(http.ListenAndServe(*httpBindAddr, m.api)) + go func() { + log.Info("Listening on ", *httpBindAddr) + log.Fatal(http.ListenAndServe(*httpBindAddr, m.api)) + }() + // Handle HTTPS if certificate and key are provided + go func() { + if *certFile != "" && *keyFile != "" { + log.Info("Listening on ", *httpsBindAddr) + log.Fatal(http.ListenAndServeTLS(*httpsBindAddr, *certFile, *keyFile, m.api)) + } + }() + + // We want to block forever to let the HTTP and HTTPS handler serve the APIs + select {} } // A monolith contains all the dendrite components.