rescue/khaganat-web
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity

Parse environment variables with boolean values

Browse source 
Simply using bool() on the string returns True for every non-empty
string. Hence, the only way to set a value to False is to set it the an
empty string, which is counter-intuitive.
This commit will instead compare the string to well-known values for
True and return accordingly. Every other non-empty string is evaluated
to False. Empty string are evaluated to the default value.
This commit is contained in:
Rodolphe Breard 2018-02-04 11:15:02 +01:00
parent ab4eb7414c
commit 71e7433040
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
khaganat/settings.py
View file

@ -14,6 +14,14 @@ from django.utils.translation import gettext_lazy as _
from django.urls import reverse_lazy from django.urls import reverse_lazy
import os import os
def get_config_bool(env_name, default=False):
val = os.getenv(env_name, default='').lower()
if val == '':
return default
return val in ('true', '1', 't', 'y', 'yes')
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -25,7 +33,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = os.getenv('KHAGANAT_SECRET_KEY') SECRET_KEY = os.getenv('KHAGANAT_SECRET_KEY')
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = bool(os.getenv('KHAGANAT_DEBUG', default='')) DEBUG = get_config_bool('KHAGANAT_DEBUG', default=False)
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [
_ for _ in os.getenv('KHAGANAT_HOSTNAMES', default='').split(',') _ for _ in os.getenv('KHAGANAT_HOSTNAMES', default='').split(',')
@ -102,7 +110,10 @@ EMAIL_HOST_PASSWORD = os.getenv('KHAGANAT_EMAIL_HOST_PASSWORD', default='')
EMAIL_USE_TLS = os.getenv('KHAGANAT_EMAIL_USE_TLS', default='') EMAIL_USE_TLS = os.getenv('KHAGANAT_EMAIL_USE_TLS', default='')
EMAIL_SUBJECT_PREFIX = os.getenv('KHAGANAT_EMAIL_SUBJECT_PREFIX', default='') EMAIL_SUBJECT_PREFIX = os.getenv('KHAGANAT_EMAIL_SUBJECT_PREFIX', default='')
DEFAULT_FROM_EMAIL = os.getenv('KHAGANAT_DEFAULT_FROM_EMAIL', default='no-reply@localhost') DEFAULT_FROM_EMAIL = os.getenv(
'KHAGANAT_DEFAULT_FROM_EMAIL',
default='no-reply@localhost'
)
# User model # User model
@ -110,8 +121,13 @@ DEFAULT_FROM_EMAIL = os.getenv('KHAGANAT_DEFAULT_FROM_EMAIL', default='no-reply@
AUTH_USER_MODEL = 'neluser.NelUser' AUTH_USER_MODEL = 'neluser.NelUser'
LOGIN_URL = os.getenv('KHAGANAT_LOGIN_URL', default='/account/login/') LOGIN_URL = os.getenv('KHAGANAT_LOGIN_URL', default='/account/login/')
LOGIN_REDIRECT_URL = reverse_lazy(os.getenv('KHAGANAT_LOGIN_REDIRECT_URL', default='index')) LOGIN_REDIRECT_URL = reverse_lazy(
REGISTER_REQUIRE_VALIDATION = bool(os.getenv('KHAGANAT_REGISTER_REQUIRE_VALIDATION', default='True')) os.getenv('KHAGANAT_LOGIN_REDIRECT_URL', default='index')
)
REGISTER_REQUIRE_VALIDATION = get_config_bool(
'KHAGANAT_REGISTER_REQUIRE_VALIDATION',
default=True
)
# Password validation # Password validation