changeset 2904:83137bbd4939

Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 02 Apr 2019 16:38:31 +0200
parents 813671873536 (current diff) da1d063ee085 (diff)
children 818ec1265772
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/config/config.go	Tue Apr 02 16:38:10 2019 +0200
+++ b/pkg/config/config.go	Tue Apr 02 16:38:31 2019 +0200
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // License-Filename: LICENSES/AGPL-3.0.txt
 //
-// Copyright (C) 2018 by via donau
+// Copyright (C) 2018, 2019 by via donau
 //   – Österreichische Wasserstraßen-Gesellschaft mbH
 // Software engineering by Intevation GmbH
 //
@@ -260,10 +260,10 @@
 	str("proxy-key", "", "signing key for proxy URLs.\n"+
 		"Defaults to random key.")
 	str("proxy-prefix", "", "URL prefix of proxy.\n"+
-		"Defaults to 'http://${web-host}:${web-port}'")
+		"Defaults to 'http://${host}:${port}'")
 
 	str("external-url", "", "URL to find the server from the outside.\n"+
-		"Defaults to 'http://${web-host}:${web-port}'")
+		"Defaults to 'http://${host}:${port}'")
 
 	str("tmp-dir", "", "Temp directory of gemma server.\n"+
 		"Defaults to system temp directory.")