mgoetz/ldap_account_manager
Archived
2
2
Fork 0
Code Issues 9 Pull Requests Releases 2 Wiki Activity

Fix bool and int env vars

Browse Source
This commit is contained in:
Linux User 2019-04-24 11:17:14 +02:00
parent fdeae3e6fa
commit 0d1ff6ad04
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/lama/Dockerfile
View File

@ -8,4 +8,4 @@ EXPOSE 80
ENTRYPOINT ["python3", "manage.py"] ENTRYPOINT ["python3", "manage.py"]
ADD ["src", "/lama"] ADD ["src", "/lama"]
CMD ["runserver", "0.0.0.0:80"] CMD ["runserver", "0.0.0.0:80"]

12
src/core/docker_settings.py
View File

@ -18,7 +18,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
DOMAIN = os.environ['DOMAIN'] DOMAIN = os.environ['DOMAIN']
SITE_NAME = os.environ['SITE_NAME'] SITE_NAME = os.environ['SITE_NAME']
SECRET_KEY = os.environ['SECRET_KEY'] SECRET_KEY = os.environ['SECRET_KEY']
DEBUG = True # bool(os.environ.get('DEBUG', False)) DEBUG = os.environ.get('DEBUG', 'False') =='TRUE'
ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split() ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split()
# Application definition # Application definition
@ -175,9 +175,9 @@ else:
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_TIMEOUT = 15 EMAIL_TIMEOUT = 15
EMAIL_HOST = os.environ['EMAIL_HOST'] EMAIL_HOST = os.environ['EMAIL_HOST']
EMAIL_PORT = os.environ['EMAIL_PORT'] EMAIL_PORT = int(os.environ['EMAIL_PORT'])
EMAIL_USE_TLS = bool(os.environ.get('EMAIL_USE_TLS', False)) EMAIL_USE_TLS = os.environ.get('EMAIL_USE_TLS', 'False') == 'TRUE'
EMAIL_USE_SSL = bool(os.environ.get('EMAIL_USE_SSL', False)) # EMAIL_USE_SSL = os.environ.get('EMAIL_USE_SSL', 'False') == 'TRUE'
DEFAULT_FROM_EMAIL = os.environ['DEFAULT_FROM_EMAIL'] DEFAULT_FROM_EMAIL = os.environ['DEFAULT_FROM_EMAIL']
SERVER_EMAIL = os.environ['SERVER_EMAIL'] SERVER_EMAIL = os.environ['SERVER_EMAIL']
@ -217,5 +217,9 @@ LOGGING = {
'level': 'DEBUG', 'level': 'DEBUG',
'handlers': ['console'], 'handlers': ['console'],
}, },
'django': {
'handlers': ['console'],
'level': 'DEBUG',
}
}, },
} }