Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

diff --git a/planetstack/nginx/planetstack.conf b/planetstack/nginx/planetstack.conf
new file mode 100644 (file)
index 0000000..d25ab0b
--- /dev/null
+++ b/planetstack/nginx/planetstack.conf
@@ -0,0 +1,22 @@
+upstream backend {
+  # least_conn;   
+  server 127.0.0.1:9001;
+  server unix:/var/run/planetstack.uwsgi.sock;
+}
+
+
+server {
+    listen 8081;
+    server_name 128.112.139.48;
+
+    location /static/ {
+        alias /opt/planetstack/core/static/;
+        expires 30d;
+        access_log off;
+    }
+
+    location / {
+        include /etc/nginx/uwsgi_params;
+        uwsgi_pass backend;
+    }
+}

diff --git a/planetstack/uwsgi/planetstack.ini b/planetstack/uwsgi/planetstack.ini
new file mode 100644 (file)
index 0000000..c712568
--- /dev/null
+++ b/planetstack/uwsgi/planetstack.ini
@@ -0,0 +1,14 @@
+[uwsgi]
+chdir = /opt/planetstack
+module = planetstack.wsgi:application
+env = DJANGO_SETTINGS_MODULE=planetstack.settings
+socket = /var/run/planestack.uwsgi.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
+harakiri = 20
+daemonize=/var/log/uwsgi/planetstack.log