summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2011-04-19 13:18:45 +0800
committerJeremy Kerr <jk@ozlabs.org>2011-04-19 13:18:45 +0800
commit85e391e7781464514b9df6e7b6936515c3db6c46 (patch)
treef646f093c93c96de239c478eb0c5e5a7758d37d4 /apps
parent8d22361203333811fb75c03442ea65bff7531891 (diff)
downloadpatchwork-85e391e7781464514b9df6e7b6936515c3db6c46.tar.bz2
patchwork-85e391e7781464514b9df6e7b6936515c3db6c46.tar.xz
settings: Use multiple-DB-style format for default settings
The DATABASE_* settings have been deprecated in django 1.3, replaced by the multiple-database style format (introduced in 1.2, which patchwork requires anyway). This change modifies the default settings.py to use the new format. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings.py b/apps/settings.py
index f56da70..24d3762 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -10,12 +10,12 @@ ADMINS = (
MANAGERS = ADMINS
-DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'patchwork' # Or path to database file if using sqlite3.
-DATABASE_USER = '' # Not used with sqlite3.
-DATABASE_PASSWORD = '' # Not used with sqlite3.
-DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+ 'NAME': 'patchwork',
+ },
+}
# Local time zone for this installation. Choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE