git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
nginx
/
planetstack.conf
diff --git
a/planetstack/nginx/planetstack.conf
b/planetstack/nginx/planetstack.conf
index
d25ab0b
..
9e36360
100644
(file)
--- a/
planetstack/nginx/planetstack.conf
+++ b/
planetstack/nginx/planetstack.conf
@@
-1,12
+1,12
@@
upstream backend {
# least_conn;
+ server unix:/var/run/uwsgi/planetstack.sock;
server 127.0.0.1:9001;
- server unix:/var/run/planetstack.uwsgi.sock;
}
server {
- listen 80
81
;
+ listen 80;
server_name 128.112.139.48;
location /static/ {