Merge branch 'master' into deploy/awi

avalon/avalon/local_settings.py

@@ -0,0 +1,14 @@
+from .settings import *
+
+ALLOWED_HOSTS = [ u'avalon.aweirdimagination.net' ]
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'avalon',
+        'USER': 'avalon',
+        'ATOMIC_REQUESTS': True,
+    }
+}
+
+STATIC_URL = '/static/'

avalon/avalon_game/views.py

@@ -10,7 +10,10 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.views.decorators.http import require_safe,\
                                          require_POST,\
                                          require_http_methods
+try:
     from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from .forms import NewGameForm, JoinGameForm, StartGameForm
 from .helpers import mission_size, mission_size_string

uwsgi.ini

@@ -0,0 +1,12 @@
+[uwsgi]
+socket=127.0.0.1:8042
+chdir=/home/anyoneeb/sites/apps/avalon/avalon-django/avalon
+plugin=python3
+module=avalon.wsgi:application
+env=DJANGO_SETTINGS_MODULE=avalon.local_settings
+master=True
+pidfile=/tmp/avalon-master.pid
+vacuum=True
+max-requests=5000
+uid=avalon
+gid=avalon