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

fixing merge conflicts

This commit is contained in:
kevgliss 2015-08-09 16:51:25 -07:00
parent 48f38a8625 f679392c61
commit d0d3e06c81
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/production/index.rst
View File

@ -185,7 +185,11 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s
} }
location / { location / {
<<<<<<< HEAD
root /path/to/lemur/static/dist; root /path/to/lemur/static/dist;
=======
root /www/lemur/lemur/static/dist;
>>>>>>> f679392c610c0cb1f7fb61986f30bf8db3c53054
include mime.types; include mime.types;
index index.html; index index.html;
} }

6
docs/quickstart/index.rst
View File

@ -194,6 +194,12 @@ You'll use the builtin HttpProxyModule within Nginx to handle proxying
index index.html; index index.html;
} }
location / {
root /www/lemur/lemur/static/dist;
include mime.types;
index index.html;
}
See :doc:`../production/index` for more details on using Nginx. See :doc:`../production/index` for more details on using Nginx.