Simplified settings

Migrated settings to typed pydantic settings

5 files changed, 0 insertions, 250 deletions

diff --git a/takahe/settings/__init__.py b/takahe/settings/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/takahe/settings/__init__.py
+++ /dev/null
diff --git a/takahe/settings/base.py b/takahe/settings/base.py
deleted file mode 100644
index 0ab3035..0000000
--- a/takahe/settings/base.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import os
-from pathlib import Path
-from typing import Optional
-
-BASE_DIR = Path(__file__).resolve().parent.parent.parent
-
-# Application definition
-
-INSTALLED_APPS = [
-    "django.contrib.admin",
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
-    "django.contrib.messages",
-    "django.contrib.staticfiles",
-    "django_htmx",
-    "core",
-    "activities",
-    "users",
-    "stator",
-]
-
-MIDDLEWARE = [
-    "django.middleware.security.SecurityMiddleware",
-    "whitenoise.middleware.WhiteNoiseMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
-    "django.middleware.common.CommonMiddleware",
-    "django.middleware.csrf.CsrfViewMiddleware",
-    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "django.contrib.messages.middleware.MessageMiddleware",
-    "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_htmx.middleware.HtmxMiddleware",
-    "core.middleware.ConfigLoadingMiddleware",
-    "users.middleware.IdentityMiddleware",
-]
-
-ROOT_URLCONF = "takahe.urls"
-
-TEMPLATES = [
-    {
-        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [BASE_DIR / "templates"],
-        "APP_DIRS": True,
-        "OPTIONS": {
-            "context_processors": [
-                "django.template.context_processors.debug",
-                "django.template.context_processors.request",
-                "django.contrib.auth.context_processors.auth",
-                "django.contrib.messages.context_processors.messages",
-                "core.context.config_context",
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = "takahe.wsgi.application"
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "HOST": os.environ.get("PGHOST", "localhost"),
-        "PORT": os.environ.get("PGPORT", 5432),
-        "NAME": os.environ.get("PGDATABASE", "takahe"),
-        "USER": os.environ.get("PGUSER", "postgres"),
-        "PASSWORD": os.environ.get("PGPASSWORD"),
-    }
-}
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
-    },
-]
-
-LANGUAGE_CODE = "en-us"
-
-TIME_ZONE = "UTC"
-
-USE_I18N = True
-
-USE_TZ = True
-
-STATIC_URL = "static/"
-
-DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
-
-AUTH_USER_MODEL = "users.User"
-
-LOGIN_URL = "/auth/login/"
-LOGOUT_URL = "/auth/logout/"
-LOGIN_REDIRECT_URL = "/"
-LOGOUT_REDIRECT_URL = "/"
-
-STATICFILES_FINDERS = [
-    "django.contrib.staticfiles.finders.FileSystemFinder",
-    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
-]
-
-STATICFILES_DIRS = [
-    BASE_DIR / "static",
-]
-
-STATIC_ROOT = BASE_DIR / "static-collected"
-
-ALLOWED_HOSTS = ["*"]
-
-AUTO_ADMIN_EMAIL: Optional[str] = None
-
-STATOR_TOKEN: Optional[str] = None
-
-SENTRY_ENABLED = False
diff --git a/takahe/settings/development.py b/takahe/settings/development.py
deleted file mode 100644
index ce75c85..0000000
--- a/takahe/settings/development.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import os
-import sys
-
-from .base import *  # noqa
-
-# Load secret key from environment with a fallback
-SECRET_KEY = os.environ.get("TAKAHE_SECRET_KEY", "insecure_secret")
-
-# Ensure debug features are on
-DEBUG = True
-
-ALLOWED_HOSTS = ["*"]
-CSRF_TRUSTED_ORIGINS = [
-    "http://127.0.0.1:8000",
-    "https://127.0.0.1:8000",
-]
-SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
-
-EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-SERVER_EMAIL = "test@example.com"
-
-MAIN_DOMAIN = os.environ.get("TAKAHE_MAIN_DOMAIN", "example.com")
-if "/" in MAIN_DOMAIN:
-    print("TAKAHE_MAIN_DOMAIN should be just the domain name - no https:// or path")
-    sys.exit(1)
-
-MEDIA_URL = os.environ.get("TAKAHE_MEDIA_URL", "/media/")
-MEDIA_ROOT = os.environ.get("TAKAHE_MEDIA_ROOT", BASE_DIR / "media")
diff --git a/takahe/settings/production.py b/takahe/settings/production.py
deleted file mode 100644
index b1034ef..0000000
--- a/takahe/settings/production.py
+++ /dev/null
@@ -1,96 +0,0 @@
-import os
-import sys
-from typing import Optional
-
-from .base import *  # noqa
-
-# Ensure debug features are off
-DEBUG = bool(os.environ.get("TAKAHE__SECURITY_HAZARD__DEBUG", False))
-
-# TODO: Allow better setting of allowed_hosts, if we need to
-ALLOWED_HOSTS = ["*"]
-
-CONN_MAX_AGE = 60
-
-### User-configurable options, pulled from the environment ###
-
-# Secret key
-try:
-    SECRET_KEY = os.environ["TAKAHE_SECRET_KEY"]
-except KeyError:
-    print("You must specify the TAKAHE_SECRET_KEY environment variable!")
-    sys.exit(1)
-
-# SSL proxy header
-if "TAKAHE_SECURE_HEADER" in os.environ:
-    SECURE_PROXY_SSL_HEADER = (
-        "HTTP_" + os.environ["TAKAHE_SECURE_HEADER"].replace("-", "_").upper(),
-        "https",
-    )
-
-# Fallback domain for links
-MAIN_DOMAIN = os.environ["TAKAHE_MAIN_DOMAIN"]
-if "/" in MAIN_DOMAIN:
-    print("TAKAHE_MAIN_DOMAIN should be just the domain name - no https:// or path")
-    sys.exit(1)
-
-# Email config
-if os.environ.get("TAKAHE_EMAIL_CONSOLE_ONLY"):
-    EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-    SERVER_EMAIL = "test@example.com"
-else:
-    SERVER_EMAIL = os.environ["TAKAHE_EMAIL_FROM"]
-    if "TAKAHE_EMAIL_SENDGRID_KEY" in os.environ:
-        EMAIL_HOST = "smtp.sendgrid.net"
-        EMAIL_PORT = 587
-        EMAIL_HOST_USER: Optional[str] = "apikey"
-        EMAIL_HOST_PASSWORD: Optional[str] = os.environ["TAKAHE_EMAIL_SENDGRID_KEY"]
-        EMAIL_USE_TLS = True
-    else:
-        EMAIL_HOST = os.environ["TAKAHE_EMAIL_HOST"]
-        EMAIL_PORT = int(os.environ["TAKAHE_EMAIL_PORT"])
-        EMAIL_HOST_USER = os.environ.get("TAKAHE_EMAIL_USER")
-        EMAIL_HOST_PASSWORD = os.environ.get("TAKAHE_EMAIL_PASSWORD")
-        EMAIL_USE_SSL = EMAIL_PORT == 465
-        EMAIL_USE_TLS = EMAIL_PORT == 587
-
-AUTO_ADMIN_EMAIL = os.environ.get("TAKAHE_AUTO_ADMIN_EMAIL")
-
-# Media storage
-MEDIA_BACKEND = os.environ.get("TAKAHE_MEDIA_BACKEND", None)
-if MEDIA_BACKEND == "local":
-    # Note that this MUST be a fully qualified URL in production
-    MEDIA_URL = os.environ.get("TAKAHE_MEDIA_URL", "/media/")
-    MEDIA_ROOT = os.environ.get("TAKAHE_MEDIA_ROOT", BASE_DIR / "media")
-elif MEDIA_BACKEND == "gcs":
-    DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
-    GS_BUCKET_NAME = os.environ["TAKAHE_MEDIA_BUCKET"]
-    GS_QUERYSTRING_AUTH = False
-elif MEDIA_BACKEND == "s3":
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-    AWS_STORAGE_BUCKET_NAME = os.environ["TAKAHE_MEDIA_BUCKET"]
-else:
-    print("Unknown TAKAHE_MEDIA_BACKEND value")
-    sys.exit(1)
-
-# Stator secret token
-STATOR_TOKEN = os.environ.get("TAKAHE_STATOR_TOKEN")
-
-# Error email recipients
-if "TAKAHE_ERROR_EMAILS" in os.environ:
-    ADMINS = [("Admin", e) for e in os.environ["TAKAHE_ERROR_EMAILS"].split(",")]
-
-# Sentry integration
-if "SENTRY_DSN" in os.environ:
-    import sentry_sdk
-    from sentry_sdk.integrations.django import DjangoIntegration
-
-    sentry_sdk.init(
-        dsn=os.environ["SENTRY_DSN"],
-        integrations=[
-            DjangoIntegration(),
-        ],
-        traces_sample_rate=1.0,
-        send_default_pii=True,
-    )
-    SENTRY_ENABLED = True
diff --git a/takahe/settings/testing.py b/takahe/settings/testing.py
deleted file mode 100644
index 39fda96..0000000
--- a/takahe/settings/testing.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .base import *  # noqa
-
-# Fixed secret key
-SECRET_KEY = "testing_secret"
-
-MAIN_DOMAIN = "example.com"