From c07ec5855a6101af0fa77cbcbaf1c2b6a666f94e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 8 Oct 2019 23:07:45 +0300 Subject: [PATCH] Revert "Read secrets from files to vars" This reverts commit 84f1f9239b923daf24e5563dffb451f0e74252cd. --- sikweb/settings-sample-prod.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/sikweb/settings-sample-prod.py b/sikweb/settings-sample-prod.py index 07d422f..6920a2d 100644 --- a/sikweb/settings-sample-prod.py +++ b/sikweb/settings-sample-prod.py @@ -19,9 +19,7 @@ DEBUG = False ALLOWED_HOSTS = ["sika.sik.party"] # SECURITY WARNING: keep the secret key used in production secret! -f = open("/run/secrets/DJANGO_SECRET_KEY", "r") -SECRET_KEY = f.readline() -f.close() +SECRET_KEY = os.getenv('SECRET_KEY', '') # ReCaptcha # http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/ @@ -30,9 +28,7 @@ GOOGLE_RECAPTCHA_SECRET_KEY = "YOUR-PRIVATE-KEY" # Email settings (more settings in base.py) EMAIL_HOST_USER = 'sikviestinta@gmail.com' -f = open("/run/secrets/DJANGO_EMAIL_PASSWD", "r") -EMAIL_HOST_PASSWORD = f.readline() -f.close() +EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWD', '') DEFAULT_EMAIL_FROM = 'SIK Viestintä ' ENABLE_AUTOMATIC_EMAILS = True @@ -42,22 +38,12 @@ TELEGRAM_BOT_TOKEN = os.getenv('TG_BOT_TOKEN') # Database settings # Only uncomment if default settings in base.py are not ok -f = open("/run/secrets/DJANGO_DB_NAME", "r") -DB_NAME = f.readline() -f.close() -f = open("/run/secrets/DJANGO_DB_USER", "r") -DB_USER = f.readline() -f.close() -f = open("/run/secrets/DJANGO_DB_PASSWORD", "r") -DB_PASSWORD = f.readline() -f.close() - DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': DB_NAME, - 'USER': DB_USER, - 'PASSWORD': DB_PASSWORD, + 'NAME': os.getenv('DB_NAME', ''), + 'USER': os.getenv('DB_USER', ''), + 'PASSWORD': os.getenv('DB_PASSWD', ''), 'HOST': os.getenv('DB_HOST', '127.0.0.1'), 'PORT': os.getenv('DB_PORT', 5432), }