lib: Update uWSGI, nginx config files

The nginx file was a replacement for '/etc/nginx/nginx.conf' instead of
a "site" file, while the uWSGI file referenced the Python 2 plugin
despite the sample deployment guide, which uses this, being Python
3-based. Correct both issues.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/lib/nginx/patchwork.conf b/lib/nginx/patchwork.conf
index 1e69d1a9239840ac55cd2ffbe4ea40e0291148b3..893589bdcca06f51e1276003b077d8de62f4dfc6 100644 (file)
--- a/lib/nginx/patchwork.conf
+++ b/lib/nginx/patchwork.conf
@@ -1,40 +1,16 @@
-user www-data;
-worker_processes 4;
-pid /var/run/nginx.pid;
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
 
-events {
-    worker_connections 768;
-}
-
-http {
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    types_hash_max_size 2048;
-
-    gzip on;
-    gzip_proxied any;
-    gzip_types text/plain text/css text/javascript application/x-javascript
-               text/xml application/xml image/svg+xml
-               application/vnd.ms-fontobject application/x-font-ttf font/opentype;
-
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
+    location = favicon.ico { access_log off; log_not_found off; }
 
-    access_log /var/log/nginx/access.log;
-    error_log /var/log/nginx/error.log;
-
-    server {
-        location = favicon.ico { access_log off; log_not_found off; }
-
-        location /static {
-            alias /var/www/patchwork;
-            expires 3h;
-        }
+    location /static {
+        alias /var/www/patchwork;
+        expires 3h;
+    }
 
-        location / {
-            include uwsgi_params;
-            uwsgi_pass unix:/run/uwsgi/patchwork.sock;
-        }
+    location / {
+        include uwsgi_params;
+        uwsgi_pass unix:/run/uwsgi/patchwork.sock;
     }
 }

diff --git a/lib/uwsgi/patchwork.ini b/lib/uwsgi/patchwork.ini
index 04a9837bd2ca4b3b683e848a4489206cc7f9a486..d67837cbacda295fb71743e354760e6401e55c73 100644 (file)
--- a/lib/uwsgi/patchwork.ini
+++ b/lib/uwsgi/patchwork.ini
@@ -1,6 +1,7 @@
 [uwsgi]
 
-plugins = python27
+# change this to python3 if running Patchwork under Python 2.7
+plugins = python3
 
 project = patchwork
 base = /opt