Merge branch 'docker_settings' into consolidation

whats_open/whats_open/settings/base.py

@@ -32,7 +32,7 @@ TEMPLATE_DEBUG = DEBUG
 ########## MANAGER CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#admins
 ADMINS = (
-    ('Your Name', 'your_email@example.com'),
+    ('GMU SRCT', 'srct@gmu.edu'),
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#managers
@@ -45,7 +45,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': normpath(join(DJANGO_ROOT, 'database.db')),
+        'NAME': normpath(join(DJANGO_ROOT, 'database/database.db')),
         'USER': '',
         'PASSWORD': '',
         'HOST': '',

whats_open/whats_open/settings/local.py

@@ -27,7 +27,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': normpath(join(DJANGO_ROOT, 'database.db')),
+        'NAME': normpath(join(DJANGO_ROOT, 'database/database.db')),
         'USER': '',
         'PASSWORD': '',
         'HOST': '',