From f679392c610c0cb1f7fb61986f30bf8db3c53054 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Sun, 19 Jul 2015 19:28:49 -0700 Subject: [PATCH] Fixing bad cherry pick --- docs/production/index.rst | 8 -------- docs/quickstart/index.rst | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/docs/production/index.rst b/docs/production/index.rst index f3f32a35..0e4829bd 100644 --- a/docs/production/index.rst +++ b/docs/production/index.rst @@ -106,12 +106,8 @@ You can make some adjustments to get a better user experience:: } location / { -<<<<<<< HEAD - root /apps/lemur/lemur/static/dist; -======= root /www/lemur/lemur/static/dist; include mime.types; ->>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes index index.html; } @@ -176,12 +172,8 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s } location / { -<<<<<<< HEAD - root /apps/lemur/lemur/static/dist; -======= root /www/lemur/lemur/static/dist; include mime.types; ->>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes index index.html; } diff --git a/docs/quickstart/index.rst b/docs/quickstart/index.rst index 432b14c3..5c4943ad 100644 --- a/docs/quickstart/index.rst +++ b/docs/quickstart/index.rst @@ -148,7 +148,6 @@ Proxying with Nginx You'll use the builtin HttpProxyModule within Nginx to handle proxying:: location / { -<<<<<<< HEAD proxy_pass http://localhost:5000; proxy_redirect off; @@ -156,11 +155,12 @@ You'll use the builtin HttpProxyModule within Nginx to handle proxying:: proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; -======= + } + + location / { root /www/lemur/lemur/static/dist; include mime.types; index index.html; ->>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes } See :doc:`../production/index` for more details on using Nginx.