Merge branch 'development' of github.com:HaitiData/haitidata into develop

django_project/core/settings/dev_docker.py

@@ -20,6 +20,15 @@ DATABASES = {
         'HOST': 'db',
         'PORT': 5432,
         'TEST_NAME': 'unittests',
+    },
+    # vector datastore for uploads
+    'datastore': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'geonode_data',
+        'USER': 'docker',
+        'PASSWORD': 'docker',
+        'HOST': 'db',
+        'PORT': 5432,
     }
 }
 

django_project/core/settings/prod_docker.py

@@ -26,9 +26,9 @@ DATABASES = {
     'datastore': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME': 'geonode_data',
-        'USER': 'geonode',
-        'PASSWORD': 'geonode',
-        'HOST': 'localhost',
+        'USER': os.environ['DATABASE_USERNAME'],
+        'PASSWORD': os.environ['DATABASE_PASSWORD'],
+        'HOST': os.environ['DATABASE_HOST'],
         'PORT': 5432,
     }
 }