Merge branch 'master' of ssh://h0v1n8.nl:/srv/git/h0v1n8-website

website_nginx.conf

@@ -1,6 +1,6 @@
 # Upstream component nginx needs to connect to.
 upstream django {
-    server unix:///opt/h0v1n8-website-env/website/website/webgui.sock; # For production file socket
+    server unix:///opt/h0v1n8-website-env/website/website.sock; # For production file socket
     #server 127.0.0.1:8001; # Web port socket for use with uwsgi-hello-world-test.py
 }
 
@@ -27,6 +27,6 @@ server {
     # Finally, send all non-media requests to the Django server.
     location / {
         uwsgi_pass  django;
-        include     /opt/rotbot-env/uwsgi_params; # the uwsgi_params file you installed
+        include     /opt/h0v1n8-website-env/uwsgi_params; # the uwsgi_params file you installed
     }
 }