From d9b006904a48ccbeafbbbe1df21e3625246f1058 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 11 Nov 2021 23:38:43 +0200 Subject: [PATCH] unify string chars --- sikweb/settings.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sikweb/settings.py b/sikweb/settings.py index cb275e3..0e3600b 100644 --- a/sikweb/settings.py +++ b/sikweb/settings.py @@ -15,10 +15,13 @@ import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration from sikweb.base import * +SENTRY_DSN = os.getenv('SENTRY_DSN', '') +DEPLOY_ENV = os.getenv('DEPLOY_ENV', 'production') + # Setup sentry sentry_sdk.init( - dsn=os.getenv("SENTRY_DSN", ""), - environment=os.getenv("DEPLOY_ENV", "production"), + dsn=SENTRY_DSN, + environment=DEPLOY_ENV, integrations=[DjangoIntegration()], # Set traces_sample_rate to 1.0 to capture 100% @@ -34,11 +37,11 @@ sentry_sdk.init( # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.getenv('DEBUG', False) == 'True' -URL = os.getenv("HOST", "api.sahkoinsinoorikilta.fi") -FRONTEND_URL = os.getenv("FRONTEND_URL", "sahkoinsinoorikilta.fi") -ALLOWED_HOSTS = ["localhost", "127.0.0.1", FRONTEND_URL, URL] +URL = os.getenv('HOST', 'api.sahkoinsinoorikilta.fi') +FRONTEND_URL = os.getenv('FRONTEND_URL', 'sahkoinsinoorikilta.fi') +ALLOWED_HOSTS = ['localhost', '127.0.0.1', FRONTEND_URL, URL] if DEBUG: - ALLOWED_HOSTS = ["*"] + ALLOWED_HOSTS = ['*'] USE_X_FORWARDED_HOST = True SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') @@ -48,8 +51,8 @@ SECRET_KEY = os.getenv('SECRET_KEY', '7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&7 # ReCaptcha # http://www.yaconiello.com/blog/integrating-google-recaptcha-to-django/ -GOOGLE_RECAPTCHA_SITE_KEY = os.getenv("GOOGLE_RECAPTCHA_SITE_KEY", "YOUR-PUBLIC-KEY") -GOOGLE_RECAPTCHA_SECRET_KEY = os.getenv("GOOGLE_RECAPTCHA_SECRET_KEY", "YOUR-PRIVATE-KEY") +GOOGLE_RECAPTCHA_SITE_KEY = os.getenv('GOOGLE_RECAPTCHA_SITE_KEY', 'YOUR-PUBLIC-KEY') +GOOGLE_RECAPTCHA_SECRET_KEY = os.getenv('GOOGLE_RECAPTCHA_SECRET_KEY', 'YOUR-PRIVATE-KEY') # Email settings (more settings in base.py) EMAIL_API_KEY = os.getenv('EMAIL_API_KEY', '')