fix settings

amidaware · Sep 16, 2024 · 48fedef · 48fedef
1 parent 0081474
commit 48fedef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.devcontainer/entrypoint.sh b/.devcontainer/entrypoint.sh
@@ -68,7 +68,7 @@ SCRIPTS_DIR = '/community-scripts'
 
 ADMIN_URL = 'admin/'
 
-ALLOWED_HOSTS = ['${API_HOST}', 'https://${APP_HOST}', '*']
+ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', '*']
 
 CORS_ORIGIN_WHITELIST = ['https://${API_HOST}', 'https://${APP_HOST}']
 CORS_ALLOW_CREDENTIALS = True

diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
@@ -159,16 +159,18 @@
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.staticfiles",
+    "django.contrib.messages",
     "channels",
     "rest_framework",
     "rest_framework.authtoken",
     "knox",
     "corsheaders",
+    "accounts",
+    "allauth",
     "allauth.account",
-    "allauth.headless",
     "allauth.socialaccount",
     "allauth.socialaccount.providers.openid_connect",
-    "accounts",
+    "allauth.headless",
     "apiv3",
     "clients",
     "agents",
@@ -237,6 +239,7 @@
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
     "tacticalrmm.middleware.AuditMiddleware",
     "allauth.account.middleware.AccountMiddleware",
 ]
@@ -254,10 +257,8 @@
     MIDDLEWARE.insert(0, "silk.middleware.SilkyMiddleware")
 
 if ADMIN_ENABLED:
-    MIDDLEWARE += ("django.contrib.messages.middleware.MessageMiddleware",)
     INSTALLED_APPS += (
         "django.contrib.admin",
-        "django.contrib.messages",
     )
 
 if DEMO: