From 599efcc79edc9e9999a964e23e7ccb0e88bc08ca Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Thu, 11 Feb 2021 13:23:53 +0100
Subject: [PATCH] settings and secrets to env.vars
---
atdb/atdb/settings/dev.py | 22 ++++++----------------
atdb/atdb/settings/docker_sdc.py | 1 -
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py
index 55a670b6..369ee4e0 100644
--- a/atdb/atdb/settings/dev.py
+++ b/atdb/atdb/settings/dev.py
@@ -30,25 +30,15 @@ if SSL_ENABLED:
# not support https whether this option then breaks those http-only locations.
# SECURE_HSTS_SECONDS = 31536000
-# Database
-# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'USER': os.environ['DATABASE_USER'],
- 'PASSWORD': os.environ['DATABASE_PASSWORD'],
-
- # database runs locally in postgres
- 'NAME': 'atdb_ldv',
- 'HOST': 'localhost',
- 'PORT': '',
-
-
- # database runs on a virtual machine
- # 'HOST': 'alta-sys-db.astron.nl',
- # 'PORT': '5432',
- # 'NAME': 'altadb'
+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+ 'NAME': os.environ['DATABASE_NAME'],
+ 'HOST': os.environ['DATABASE_HOST'],
+ 'PORT': os.environ['DATABASE_PORT'],
+ 'USER': os.environ['DATABASE_USER'],
+ 'PASSWORD': os.environ['DATABASE_PASSWORD'],
},
}
diff --git a/atdb/atdb/settings/docker_sdc.py b/atdb/atdb/settings/docker_sdc.py
index 826ff863..d87365cc 100644
--- a/atdb/atdb/settings/docker_sdc.py
+++ b/atdb/atdb/settings/docker_sdc.py
@@ -30,7 +30,6 @@ DATABASES = {
'PORT': os.environ['DATABASE_PORT'],
'USER' : os.environ['DATABASE_USER'],
'PASSWORD' : os.environ['DATABASE_PASSWORD'],
-
},
}
--
GitLab