diff mbox

[1/2] INSTALL: Update the database configuration instructions

Message ID 1409443357-26823-1-git-send-email-damien.lespiau@intel.com
State Accepted
Headers show

Commit Message

Damien Lespiau Aug. 31, 2014, 12:02 a.m. UTC 
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>
---
 docs/INSTALL | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

Comments

Jeremy Kerr Sept. 7, 2014, 12:42 p.m. UTC | #1 
Hi Damien,

> 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.

Ah, excellent. Thanks for the contribution, I've applied and pushed.

Cheers,


Jeremy
diff mbox

Patch

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