From c1d7bef768be4583f11e0702d9bdfb02a8e2f356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 11 Mar 2015 19:44:31 +0100 Subject: [PATCH] added cert_key and cert_file to defaults.ini --- conf/defaults.ini | 3 +++ pkg/setting/setting.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index fce5048460e..7e195c93a23 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -16,6 +16,9 @@ router_logging = false ; the path relative to the binary where the static (html/js/css) files are placed static_root_path = public enable_gzip = false +; if https protocol +cert_file = +cert_key = [database] ; Either "mysql", "postgres" or "sqlite3", it's your choice diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 87b9f664abc..b8d038dbc29 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -198,7 +198,7 @@ func NewConfigContext(config string) { if server.Key("protocol").MustString("http") == "https" { Protocol = HTTPS CertFile = server.Key("cert_file").String() - KeyFile = server.Key("cert_file").String() + KeyFile = server.Key("cert_key").String() } Domain = server.Key("domain").MustString("localhost")