Browse Source

docs: small update to IIS proxy docs

Daniel Lee 8 years ago
parent
commit
87064bff79
2 changed files with 7 additions and 4 deletions
  1. 5 2
      docs/sources/installation/behind_proxy.md
  2. 2 2
      docs/sources/tutorials/iis.md

+ 5 - 2
docs/sources/installation/behind_proxy.md

@@ -77,13 +77,14 @@ Given:
 - subpath `grafana`
 - Grafana installed on `http://localhost:3000`
 - server config:
+
     ```bash
     [server]
     domain = localhost:8080
     root_url = %(protocol)s://%(domain)s:/grafana
     ```
 
-Create an Inbound Rule for the parent website (localhost:8080 in this example) with the following settings:
+Create an Inbound Rule for the parent website (localhost:8080 in this example) in IIS Manager with the following settings:
 
 - pattern: `grafana(/)?(.*)`
 - check the `Ignore case` checkbox
@@ -91,7 +92,7 @@ Create an Inbound Rule for the parent website (localhost:8080 in this example) w
 - check the `Append query string` checkbox
 - check the `Stop processing of subsequent rules` checkbox
 
-The rewrite rule that is generated for the web.config:
+This is the rewrite rule that is generated in the `web.config`:
 
 ```xml
   <rewrite>
@@ -103,3 +104,5 @@ The rewrite rule that is generated for the web.config:
       </rules>
   </rewrite>
 ```
+
+See the [tutorial on IIS Url Rewrites](http://docs.grafana.org/tutorials/iis/) for more in-depth instructions.

+ 2 - 2
docs/sources/tutorials/iis.md

@@ -9,14 +9,14 @@ weight = 10
 
 # How to Use IIS with URL Rewrite as a Reverse Proxy for Grafana on Windows
 
-If you want Grafana to be a subdomain under a website in IIS then the URL Rewrite module for ISS can be used to support this.
+If you want Grafana to be a subpath or subfolder under a website in IIS then the URL Rewrite module for ISS can be used to support this.
 
 Example:
 
 - Parent site: http://localhost:8080
 - Grafana: http://localhost:3000
 
-Grafana as a subdomain: http://localhost:8080/grafana 
+Grafana as a subpath: http://localhost:8080/grafana 
 
 ## Setup