Isolate staging and production settings paths

mandelstudio/settings/base.py

@@ -36,19 +36,6 @@ INSTALLED_APPS = [
     "mandelstudio",
 ] + INSTALLED_APPS
 
-# Ensure the canonical staging / production hostnames are accepted by Django.
-# (Staging uses the welkomstaging domain; production uses mandelblog.com.)
-_extra_allowed_hosts = [
-    "mandelstudio.welkombij.mandelblog.com",
-    "www.mandelblog.com",
-    "mandelblog.com",
-]
-if "ALLOWED_HOSTS" in globals():
-    for _host in _extra_allowed_hosts:
-        if _host not in ALLOWED_HOSTS:
-            ALLOWED_HOSTS.append(_host)
-
-
 # Never allow demo-data plugins in this production project context.
 def _is_demo_data_app(app_label: str) -> bool:
     normalized = "".join(ch for ch in app_label.lower() if ch.isalnum())

mandelstudio/settings/env/prd.py

@@ -6,10 +6,18 @@ except ModuleNotFoundError:
     pass
 
 DEBUG = False
-STATIC_ROOT = "/srv/www/mandelstudio/static/"
-MEDIA_ROOT = "/srv/www/mandelstudio/media/"
-PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio/private/"
-ALLOWED_HOSTS.append("mandelstudio.%s" % salt_target)  # pylint: disable=E0602
+STATIC_ROOT = "/srv/www/mandelstudio-prd/static/"
+MEDIA_ROOT = "/srv/www/mandelstudio-prd/media/"
+PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio-prd/private/"
+
+DATABASES["default"]["NAME"] = "/srv/www/mandelstudio-prd/db.sqlite3"
+
+ALLOWED_HOSTS = [
+    "www.mandelblog.com",
+    "mandelblog.com",
+]
+if "salt_target" in globals():
+    ALLOWED_HOSTS.append("mandelstudio.%s" % salt_target)  # pylint: disable=E0602
 # pylint: disable=E0602
 WAGTAILSEARCH_BACKENDS["default"]["URLS"] = ["https://search.mandelblog.com:9200"]
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"

mandelstudio/settings/env/stg.py

@@ -6,11 +6,15 @@ except ModuleNotFoundError:
     pass
 
 DEBUG = False
-STATIC_ROOT = "/srv/www/mandelstudio/static/"
-MEDIA_ROOT = "/srv/www/mandelstudio/media/"
-PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio/private/"
+STATIC_ROOT = "/srv/www/mandelstudio-stg/static/"
+MEDIA_ROOT = "/srv/www/mandelstudio-stg/media/"
+PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio-stg/private/"
 
-ALLOWED_HOSTS = ["*"]
+DATABASES["default"]["NAME"] = "/srv/www/mandelstudio-stg/db.sqlite3"
+
+ALLOWED_HOSTS = [
+    "mandelstudio.welkombij.mandelblog.com",
+]
 
 # Force mail to console
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"