Merge pull request #32 from CanDIG/daisieh/ingest

Read in db password from secrets file

chord_metadata_service/metadata/settings.py

@@ -23,7 +23,10 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
+POSTGRES_PASSWORD_FILE = os.environ.get('POSTGRES_PASSWORD_FILE')
+if POSTGRES_PASSWORD_FILE is not None:
+    with open(os.environ.get('POSTGRES_PASSWORD_FILE'), "r") as f:
+        POSTGRES_PASSWORD_FILE = f.read()
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
@@ -55,7 +58,7 @@
 # Allowed hosts - TODO: Derive from CHORD_URL
 
 CHORD_HOST = urlparse(CHORD_URL or "").netloc
-ALLOWED_HOSTS = [CHORD_HOST or "localhost"]
+ALLOWED_HOSTS = ["*"]  # we'll determine access via middleware before we get here
 if DEBUG:
     ALLOWED_HOSTS = list(set(ALLOWED_HOSTS + ["localhost", "127.0.0.1", "[::1]"]))
 
@@ -185,7 +188,7 @@
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': os.environ.get("POSTGRES_DATABASE", 'metadata'),
         'USER': os.environ.get("POSTGRES_USER", 'admin'),
-        'PASSWORD': os.environ.get("POSTGRES_PASSWORD", 'admin'),
+        'PASSWORD': os.environ.get("POSTGRES_PASSWORD", POSTGRES_PASSWORD_FILE),
 
         # Use sockets if we're inside a CHORD container / as a priority
         'HOST': os.environ.get("POSTGRES_SOCKET_DIR", os.environ.get("POSTGRES_HOST", "localhost")),