From: Tony Mack <tmack@tux.cs.princeton.edu>
Date: Mon, 22 Dec 2014 21:40:44 +0000 (-0500)
Subject: fix inconsistencies
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b6af3b421e46ec9e987f61fa37eff031a776d71c;hp=a2d23baf46ca07b9b46b3be303675caa748eb705;p=plstackapi.git

fix inconsistencies
---

diff --git a/planetstack/nginx/planetstack.conf b/planetstack/nginx/planetstack.conf
index d25ab0b..9e36360 100644
--- 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 8081;
+    listen 80;
     server_name 128.112.139.48;
 
     location /static/ {
diff --git a/planetstack/uwsgi/planetstack.ini b/planetstack/uwsgi/planetstack.ini
index c712568..1d84d99 100644
--- a/planetstack/uwsgi/planetstack.ini
+++ b/planetstack/uwsgi/planetstack.ini
@@ -2,13 +2,17 @@
 chdir = /opt/planetstack
 module = planetstack.wsgi:application
 env = DJANGO_SETTINGS_MODULE=planetstack.settings
-socket = /var/run/planestack.uwsgi.sock
+socket = /var/run/uwsgi/planetstack.sock
 socket = 127.0.0.1:9001
 http = 128.112.139.48:9002
 stats = 127.0.0.1:9003
 workers = 3
 master = true
-processes = 8 
-#--uid=1000 --gid=2000
+processes = 8
+uid = uwsgi
+gid = webserver 
 harakiri = 20
 daemonize=/var/log/uwsgi/planetstack.log 
+static-map = /static=/var/www/planetstack/static
+pidfile = /var/run/uwsgi/uwsgi.pid
+