From 79c48bacda8867e97a1ec305b0822b9148d31c71 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 24 May 2016 15:09:17 -0400 Subject: [PATCH] Use ALLOWED_HOSTS for CSRF_TRUSTED_ORIGINS and Swagger URL --- netbox/netbox/settings.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 805316d00..55a7ab57c 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -21,7 +21,6 @@ for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: # Default configurations ADMINS = getattr(configuration, 'ADMINS', []) -CSRF_TRUSTED_ORIGINS = getattr(configuration, 'CSRF_TRUSTED_ORIGINS', []) DEBUG = getattr(configuration, 'DEBUG', False) EMAIL = getattr(configuration, 'EMAIL', {}) LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False) @@ -30,6 +29,7 @@ PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50) NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '') NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '') TIME_ZONE = getattr(configuration, 'TIME_ZONE', 'UTC') +CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -149,6 +149,12 @@ REST_FRAMEWORK = { 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',) } +# Swagger settings (API docs) +SWAGGER_SETTINGS = { + 'base_path': '{}/api/docs'.format(ALLOWED_HOSTS[0]), +} + + try: HOSTNAME = socket.gethostname() except: