summaryrefslogtreecommitdiff
path: root/scipy2017
diff options
context:
space:
mode:
Diffstat (limited to 'scipy2017')
-rwxr-xr-xscipy2017/settings.py6
-rwxr-xr-xscipy2017/urls.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/scipy2017/settings.py b/scipy2017/settings.py
index 0d85e28..447492f 100755
--- a/scipy2017/settings.py
+++ b/scipy2017/settings.py
@@ -93,6 +93,8 @@ STATICFILES_DIRS = (
ROOT_URLCONF = 'scipy2017.urls'
+URL_ROOT = '/'
+
WSGI_APPLICATION = 'scipy2017.wsgi.application'
@@ -105,8 +107,8 @@ DATABASES = {
'NAME': DBNAME, # Or path to database file if using sqlite3.
'USER': DBUSER,
'PASSWORD': DBPWD,
- 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
- 'PORT': '',
+ 'HOST': '127.0.0.1', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
+ 'PORT': '3306',
}
}
diff --git a/scipy2017/urls.py b/scipy2017/urls.py
index 5878a44..057f6e5 100755
--- a/scipy2017/urls.py
+++ b/scipy2017/urls.py
@@ -10,7 +10,7 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^', include('website.urls', namespace='website')),
- url(r'^2016/', include('website.urls', namespace='website')),
+ url(r'^2017/', include('website.urls', namespace='website')),
url(r'^', include('social.apps.django_app.urls', namespace='social')),
url(r'^', include('django.contrib.auth.urls', namespace='auth')),