diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-08-31 01:02:36 +0100 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-09-07 20:07:39 +0800 |
| commit | ad5fce448df4d6f604de3b2275cbeb3d4f2f3817 (patch) | |
| tree | 1b4687f397bf1b7a8af982097ae9c3e7895e7d9d /docs/INSTALL | |
| parent | 3d0da317e4a458accc0efd7ade7dd332ca92fb96 (diff) | |
| download | patchwork-ad5fce448df4d6f604de3b2275cbeb3d4f2f3817.tar patchwork-ad5fce448df4d6f604de3b2275cbeb3d4f2f3817.tar.gz | |
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 <damien.lespiau@intel.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'docs/INSTALL')
| -rw-r--r-- | docs/INSTALL | 32 |
1 files changed, 20 insertions, 12 deletions
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 |