From 915f2a4914cdf7f73fba02fdbee11a131dc3fc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Jan 2014 11:58:59 +0100 Subject: [PATCH] updated readme.md --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d3f1ca43ccf..74f8409c644 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,12 @@ Header set Access-Control-Allow-Methods "GET, OPTIONS" Header set Access-Control-Allow-Headers "origin, authorization, accept" ``` -If your Graphite web is proteced by basic authentication, you have to enable the HTTP verb OPTIONS. This looks like the following for Apache: +If your Graphite web is proteced by basic authentication, you have to enable the HTTP verb OPTIONS, origin +(no wildcards are allowed in this case) and add Access-Control-Allow-Credentials. This looks like the following for Apache: ``` +Header set Access-Control-Allow-Origin "http://mygrafana.com:5656" +Header set Access-Control-Allow-Credentials true + AuthName "graphs restricted" AuthType Basic @@ -68,13 +72,6 @@ If your Graphite web is proteced by basic authentication, you have to enable the ``` -If you use basic authentication you need to set **Access-Control-Allow-Origin and add **Access-Control-Allow-Credentials. Example: -``` -Header set Access-Control-Allow-Origin "http://mygrafana.com:5656" -Header set Access-Control-Allow-Credentials true -``` - - # Roadmap - Improve and refine the target parser and editing - Improve graphite import feature