summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMadhusudan.C.S2009-11-05 03:24:06 +0530
committerMadhusudan.C.S2009-11-05 03:24:06 +0530
commit0f665d4ab72c507b18f1eaf72948092fa1af0d0a (patch)
treea7b0ece2a7d1234febd7b1921d5252e121b4e6b4 /project
parent8960a9793629006c18bc85410dbfdb8d496e0600 (diff)
parentce491368d3fcd804e384971cc32911fb2c195047 (diff)
downloadscipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.tar.gz
scipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.tar.bz2
scipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.zip
Merged Mainline and Madhu branches.
Diffstat (limited to 'project')
-rw-r--r--project/production.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/project/production.py b/project/production.py
index 4f89b15..1104c24 100644
--- a/project/production.py
+++ b/project/production.py
@@ -1,7 +1,10 @@
#django
from project.settings import *
-SITE_ID = 2
+DEBUG=True
+TEMPLATE_DEBUG=DEBUG
+
+SITE_ID = 1
INSTALLED_APPS = (
'django.contrib.auth',
@@ -23,10 +26,11 @@ INSTALLED_APPS = (
'basic.media',
'django_extensions',
'south',
+ 'registration',
)
-DATABASE_ENGINE = 'postgresql_psycopg2'
-DATABASE_NAME = 'kpc09'
-DATABASE_USER = 'kpc09'
+DATABASE_ENGINE = 'mysql'
+DATABASE_NAME = 'conference2009'
+DATABASE_USER = 'root'
# Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo
from project.local import DATABASE_PASSWORD