From b138ae9d4c846d7b3263aa253cd7fd93452725e4 Mon Sep 17 00:00:00 2001 From: dadosch Date: Tue, 2 Oct 2018 18:59:55 +0000 Subject: [PATCH 1/2] Update configuration doc to include socket@server `protocol=socket` and `socket=` path in [server] fixes https://github.com/grafana/grafana/issues/8701 --- docs/sources/installation/configuration.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 5a838e8a321..5f209e67c9b 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -127,10 +127,13 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have ### protocol -`http` or `https` +`http`,`https` or `socket` > **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination. +### socket +Path where the socket should be created in case of `protocol=socket`. Please make sure that Grafana has appropiate permissions. + ### domain This setting is only used in as a part of the `root_url` setting (see below). Important if you From 2500fe27f13be02c9e070faa1e3368aad3671dc4 Mon Sep 17 00:00:00 2001 From: dadosch Date: Tue, 2 Oct 2018 19:20:48 +0000 Subject: [PATCH 2/2] Fix "appropriate"-typo --- docs/sources/installation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 5f209e67c9b..8d156e739bf 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -132,7 +132,7 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have > **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination. ### socket -Path where the socket should be created in case of `protocol=socket`. Please make sure that Grafana has appropiate permissions. +Path where the socket should be created when `protocol=socket`. Please make sure that Grafana has appropriate permissions. ### domain