From 693379f8125bf77527ee043af110707132e02f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vegard=20Sporst=C3=B8l?= <vegarms@stud.ntnu.no>
Date: Thu, 4 Mar 2021 09:54:28 +0100
Subject: [PATCH] update from base repository
---
backend/secfit/secfit/settings.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/backend/secfit/secfit/settings.py b/backend/secfit/secfit/settings.py
index 0f702f0..67c0e22 100644
--- a/backend/secfit/secfit/settings.py
+++ b/backend/secfit/secfit/settings.py
@@ -12,6 +12,8 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
from pathlib import Path
import os
+from .djangoHeroku import settings
+
# Get the GROUPID variable to accept connections from the application server and NGINX
@@ -43,8 +45,8 @@ ALLOWED_HOSTS = [
"10." + groupid + ".0.4",
"molde.idi.ntnu.no",
"10.0.2.2",
- "secfit-group15-frontend.herokuapp.com"
- "secfit-group15-backend.herokuapp.com"
+ "secfit-group15-frontend.herokuapp.com",
+ "secfit-group15-backend.herokuapp.com",
]
# Application definition
--
GitLab