From ad5fce448df4d6f604de3b2275cbeb3d4f2f3817 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Sun, 31 Aug 2014 01:02:36 +0100 Subject: INSTALL: Update the database configuration instructions That's the "new" (django 1.5+) way of defining databases, strictly following the instructions wasn't working. This should save the next user a bit of time. Signed-off-by: Damien Lespiau Signed-off-by: Jeremy Kerr --- docs/INSTALL | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'docs') diff --git a/docs/INSTALL b/docs/INSTALL index 5716ed2..dad9c7e 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -52,12 +52,16 @@ in brackets): settings, using local_settings.py (see below) to override the defaults in settings.py: - DATABASE_ENGINE = 'postgresql_psycopg2' - DATABASE_NAME = 'patchwork' - DATABASE_USER = 'patchwork' - DATABASE_PASSWORD = 'my_secret_password - DATABASE_HOST = 'localhost' - DATABASE_PORT = '' + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'HOST': 'localhost', + 'PORT': '', + 'USER': 'patchwork', + 'PASSWORD': 'my_secret_password', + 'NAME': 'patchwork', + }, + } For MySQL: $ mysql @@ -69,12 +73,16 @@ in brackets): settings, using local_settings.py (see below) to override the defaults in settings.py: - DATABASE_ENGINE = 'mysql' - DATABASE_NAME = 'patchwork' - DATABASE_USER = 'root' - DATABASE_PASSWORD = 'my_secret_root_password' - DATABSE_HOST = 'localhost' - DATABASE_PORT = '' + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'HOST': 'localhost', + 'PORT': '', + 'USER': 'patchwork', + 'PASSWORD': 'my_secret_password', + 'NAME': 'patchwork', + }, + } 2. Django setup -- cgit v1.2.3