Merge pull request #16 from Seshat-Global-History-Databank/kalleweste…

…rling/issue178 Correct the environment names for database connection
Seshat-Global-History-Databank · Jul 8, 2024 · 37083f2 · 37083f2
2 parents 44eede3 + 888bd65
commit 37083f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/docs/source/getting-started/setup/local/macos.rst b/docs/source/getting-started/setup/local/macos.rst
@@ -219,11 +219,11 @@ The file should look like this:
 
 .. code-block::
 
-    NAME=<seshat_db_name>
-    USER=postgres
-    HOST=localhost
-    PORT=5432
-    PASSWORD=<db_password>
+    DB_NAME=<seshat_db_name>
+    DB_USER=postgres
+    DB_HOST=localhost
+    DB_PORT=5432
+    DB_PASSWORD=<db_password>
 
 
 Step 10: Migrate the database

diff --git a/seshat/settings/local.py b/seshat/settings/local.py
@@ -39,11 +39,11 @@
     DATABASES = {
         'default': {
             'ENGINE': 'django.contrib.gis.db.backends.postgis',
-            'NAME': env('NAME'),
-            'USER': 'postgres',
-            'HOST': env('HOST'),
-            'PORT': env('PORT'),
-            'PASSWORD': env('PASSWORD')
+            'NAME': env('DB_NAME'),
+            'USER': env('DB_USER') or 'postgres',
+            'HOST': env('DB_HOST'),
+            'PORT': env('DB_PORT'),
+            'PASSWORD': env('DB_PASSWORD')
         }
     }
     """