diff options
| author | Madhusudan.C.S | 2009-11-05 03:24:06 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2009-11-05 03:24:06 +0530 |
| commit | 0f665d4ab72c507b18f1eaf72948092fa1af0d0a (patch) | |
| tree | a7b0ece2a7d1234febd7b1921d5252e121b4e6b4 | |
| parent | 8960a9793629006c18bc85410dbfdb8d496e0600 (diff) | |
| parent | ce491368d3fcd804e384971cc32911fb2c195047 (diff) | |
| download | scipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.tar.gz scipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.tar.bz2 scipycon-0f665d4ab72c507b18f1eaf72948092fa1af0d0a.zip | |
Merged Mainline and Madhu branches.
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | buildout.cfg | 2 | ||||
| -rw-r--r-- | production.cfg | 5 | ||||
| -rw-r--r-- | project/production.py | 12 |
4 files changed, 13 insertions, 7 deletions
@@ -38,4 +38,5 @@ project.db project/media/user/* project/static/media project/kiwipycon/user/*.pyc +apache/* diff --git a/buildout.cfg b/buildout.cfg index e65cbfc..4adff57 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -61,7 +61,7 @@ urls = [django-command-extensions] recipe = zerokspot.recipe.git -repository = http://github.com/django-extensions/django-extensions.git +repository = git://github.com/django-extensions/django-extensions.git [south] recipe = infrae.subversion diff --git a/production.cfg b/production.cfg index 67ae8be..ee5ddc9 100644 --- a/production.cfg +++ b/production.cfg @@ -2,5 +2,6 @@ extends = buildout.cfg -eggs += - psycopg2 +#eggs += +# psycopg2 +#
\ No newline at end of file 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 |