Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing bad cherry pick

This commit is contained in:
kevgliss 2015-07-19 19:28:49 -07:00
parent f78e9d47d1
commit f679392c61
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/production/index.rst
View File

@ -106,12 +106,8 @@ You can make some adjustments to get a better user experience::
} }
location / { location / {
<<<<<<< HEAD
root /apps/lemur/lemur/static/dist;
=======
root /www/lemur/lemur/static/dist; root /www/lemur/lemur/static/dist;
include mime.types; include mime.types;
>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
index index.html; index index.html;
} }
@ -176,12 +172,8 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s
} }
location / { location / {
<<<<<<< HEAD
root /apps/lemur/lemur/static/dist;
=======
root /www/lemur/lemur/static/dist; root /www/lemur/lemur/static/dist;
include mime.types; include mime.types;
>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
index index.html; index index.html;
} }

6
docs/quickstart/index.rst
View File

@ -148,7 +148,6 @@ Proxying with Nginx
You'll use the builtin HttpProxyModule within Nginx to handle proxying:: You'll use the builtin HttpProxyModule within Nginx to handle proxying::
location / { location / {
<<<<<<< HEAD
proxy_pass http://localhost:5000; proxy_pass http://localhost:5000;
proxy_redirect off; 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-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
======= }
location / {
root /www/lemur/lemur/static/dist; root /www/lemur/lemur/static/dist;
include mime.types; include mime.types;
index index.html; index index.html;
>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
} }
See :doc:`../production/index` for more details on using Nginx. See :doc:`../production/index` for more details on using Nginx.