From ab49895133dc64f6d484cbfc323b99b6cfb5bb1b Mon Sep 17 00:00:00 2001
From: Dillon Lareau <jdlareau@cert.org>
Date: Thu, 6 Sep 2018 14:51:21 -0400
Subject: [PATCH] Now 1.10 compatible?

---
 config/puzzlehunt_setup.sh | 8 ++++++--
 puzzlehunt_server/urls.py  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/puzzlehunt_setup.sh b/config/puzzlehunt_setup.sh
index d976d238..873b74c5 100644
--- a/config/puzzlehunt_setup.sh
+++ b/config/puzzlehunt_setup.sh
@@ -24,7 +24,7 @@ apt-get install -y git
 try cd /vagrant
 try ln -s /vagrant/puzzlehunt_server /home/vagrant/puzzlehunt_server
 try cd /home/vagrant/puzzlehunt_server
-try git checkout development # Only needed until test branch is merged
+try git checkout tests # Only needed until test branch is merged
 
 # Make sure we don't get prompted for anything
 try export DEBIAN_FRONTEND="noninteractive"
@@ -39,9 +39,12 @@ apt-get install -y libapache2-mod-proxy-html || true
 # Set up MYSQL user and database
 try mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "CREATE DATABASE IF NOT EXISTS $MYSQL_PUZZLEHUNT_DB"
 try mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "grant all privileges on $MYSQL_PUZZLEHUNT_DB.* to '$MYSQL_NORMAL_USER'@'localhost' identified by '$MYSQL_NORMAL_PASSWORD'"
+try mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "grant all privileges on test_$MYSQL_PUZZLEHUNT_DB.* to '$MYSQL_NORMAL_USER'@'localhost'"
 
 # Configure application (Consider this the same as modifying secret_settings.py.template)
-try cat > puzzlehunt_server/secret_settings.py <<EOF
+try cat > puzzlehunt_server/settings/local_settings.py <<EOF
+from .base_settings import *
+DEBUG=False
 SECRET_KEY = '$(head /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9!@#$%^&*(\-_=+)' | head -c 50)'
 DATABASES = {
     'default': {
@@ -67,6 +70,7 @@ try source venv/bin/activate
 try pip install -r requirements.txt
 
 # Run application setup commands
+export DJANGO_SETTINGS_MODULE="puzzlehunt_server.settings.local_settings"
 try mkdir -p ./media/puzzles
 try python manage.py migrate
 try python manage.py collectstatic --noinput
diff --git a/puzzlehunt_server/urls.py b/puzzlehunt_server/urls.py
index 47ceeaba..c5f61da8 100644
--- a/puzzlehunt_server/urls.py
+++ b/puzzlehunt_server/urls.py
@@ -13,7 +13,7 @@
     1. Add an import:  from blog import urls as blog_urls
     2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
 """
-from django.conf.urls import include, url, patterns
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.auth import views as base_auth_views
 from django.conf import settings
@@ -36,4 +36,4 @@
 if(settings.DEBUG):
     import debug_toolbar
     urlpatterns = urlpatterns + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-    urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)), )
+    urlpatterns.append(url(r'^__debug__/', include(debug_toolbar.urls)))