diff options
Diffstat (limited to 'scipy2012/settings.py')
| -rwxr-xr-x | scipy2012/settings.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scipy2012/settings.py b/scipy2012/settings.py index 478ada0..8fe709b 100755 --- a/scipy2012/settings.py +++ b/scipy2012/settings.py @@ -1,5 +1,6 @@ # Django settings for scipy2012 project. from os.path import * +from local import * DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -14,11 +15,11 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'scipy2012.db', # Or path to database file if using sqlite3. + 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'scipy2012', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: - 'USER': '', - 'PASSWORD': '', + 'USER': 'root', + 'PASSWORD': DB_PASS, 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. 'PORT': '', # Set to empty string for default. } @@ -68,7 +69,7 @@ STATIC_ROOT = '' # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/static/' +STATIC_URL = '/2012/static/' # Additional locations of static files STATICFILES_DIRS = ( |