diff options
| -rw-r--r-- | app/server.go | 7 | ||||
| -rw-r--r-- | i18n/en.json | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/server.go b/app/server.go index 0c6c25ba5..e89041ebe 100644 --- a/app/server.go +++ b/app/server.go @@ -6,6 +6,7 @@ package app import ( "context" "crypto/tls" + "fmt" "io" "io/ioutil" "net" @@ -149,8 +150,10 @@ func (a *App) StartServer() error { } if *a.Config().ServiceSettings.Forward80To443 { - if host, _, err := net.SplitHostPort(addr); err != nil { + if host, port, err := net.SplitHostPort(addr); err != nil { l4g.Error("Unable to setup forwarding: " + err.Error()) + } else if port != "443" { + return fmt.Errorf(utils.T("api.server.start_server.forward80to443.enabled_but_listening_on_wrong_port"), port) } else { httpListenAddress := net.JoinHostPort(host, "http") @@ -169,6 +172,8 @@ func (a *App) StartServer() error { }() } } + } else if *a.Config().ServiceSettings.UseLetsEncrypt { + return errors.New(utils.T("api.server.start_server.forward80to443.disabled_while_using_lets_encrypt")) } a.Srv.didFinishListen = make(chan struct{}) diff --git a/i18n/en.json b/i18n/en.json index 974334d85..d623ce864 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1955,6 +1955,14 @@ "translation": "Server is initializing..." }, { + "id": "api.server.start_server.forward80to443.disabled_while_using_lets_encrypt", + "translation": "Must enable Forward80To443 when using LetsEncrypt" + }, + { + "id": "api.server.start_server.forward80to443.enabled_but_listening_on_wrong_port", + "translation": "Cannot forward port 80 to port 443 while listening on port %s: disable Forward80To443 if using a proxy server" + }, + { "id": "api.server.start_server.listening.info", "translation": "Server is listening on %v" }, |