Merge branch 'develop'

sikweb/settings-sample-prod.py

@@ -19,7 +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")
+f = open(os.getenv("DJANGO_SECRET_KEY_FILE"), "r")
 SECRET_KEY = f.readline()
 f.close()
 
@@ -30,7 +30,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")
+f = open(os.getenv("DJANGO_EMAIL_PASSWD_FILE"), "r")
 EMAIL_HOST_PASSWORD = f.readline()
 f.close()
 DEFAULT_EMAIL_FROM = 'SIK Viestintä <sikviestinta@gmail.com>'
@@ -42,13 +42,13 @@ 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")
+f = open(os.getenv("DJANGO_DB_NAME_FILE"), "r")
 DB_NAME = f.readline()
 f.close()
-f = open("/run/secrets/DJANGO_DB_USER", "r")
+f = open(os.getenv("DJANGO_DB_USER_FILE"), "r")
 DB_USER = f.readline()
 f.close()
-f = open("/run/secrets/DJANGO_DB_PASSWORD", "r")
+f = open(os.getenv("DJANGO_DB_PASSWORD_FILE"), "r")
 DB_PASSWORD = f.readline()
 f.close()