diff --git a/etebase_server/settings.py b/etebase_server/settings.py index f6c726d..8731083 100644 --- a/etebase_server/settings.py +++ b/etebase_server/settings.py @@ -163,10 +163,18 @@ if any(os.path.isfile(x) for x in config_locations): ETEBASE_REDIS_URI = section.get("redis_uri") if "allowed_hosts" in config: + if "ports" in config and "https_port" in config["ports"]: + https_port = ":" + config["ports"]["https_port"] + else: + https_port = "" + if "ports" in config and "http_port" in config["ports"]: + http_port = ":" + config["ports"]["http_port"] + else: + http_port = "" ALLOWED_HOSTS = [y for x, y in config.items("allowed_hosts")] - CSRF_TRUSTED_ORIGINS = ["https://" + y for x, y in config.items("allowed_hosts")] + \ - ["http://" + y for x, y in config.items("allowed_hosts")] - + CSRF_TRUSTED_ORIGINS = ["https://" + y + https_port for x, y in config.items("allowed_hosts")] + \ + ["http://" + y + http_port for x, y in config.items("allowed_hosts")] + if "database" in config: DATABASES = {"default": {x.upper(): y for x, y in config.items("database")}}