From 00a713c42e0d049cbebd93afcb876f121a378d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 7 Apr 2015 16:48:30 +0200 Subject: [PATCH] Updated configuration docs with cert_key and cert_file info, Closes #1722 --- docs/sources/installation/configuration.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index df8ed1ea83a..9454a7fa200 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -53,6 +53,11 @@ Or redirect port 80 to the grafana port using: $ sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3000 ``` +Another way is put nginx or apache infront of Grafana and have them proxy requests to Grafana. + +### protocol +`http` or `https` + ### domain This setting is only used in as a part of the root_url setting (see below). Important if you use github or google oauth. @@ -68,6 +73,12 @@ google or github oauth authentication (for the callback url to be correct). The path to the directory where the frontend files (html & js & css). Default to `public` which is why the Grafana binary needs to be executed with working directory set to the installation path. +### cert_file +Path to cert file (if protocol is https) + +### cert_key +Path to cert key file (if protocol is https) +