Another go at sorting the settings mess

Dockerfile

@@ -15,10 +15,10 @@ RUN pip3 install ${RELEASE} --no-cache-dir
 
 WORKDIR ${TARGET}
 
-COPY docker_settings.py local_settings.py
-RUN SECRET_KEY=_ ${TARGET}/bin/manage collectstatic --noinput
+RUN SECRET_KEY=_ poly-tool collectstatic --noinput
 
 VOLUME ["/var/polyphonic"]
 
-ENTRYPOINT ["manage"]
-CMD ["runserver", "0.0.0.0:8000", "--insecure"]
+RUN pip3 install gunicorn whitenoise
+
+CMD ["gunicorn", "-b", "0.0.0.0", "polyphonic.wsgi"]

Makefile

@@ -8,7 +8,7 @@ test: check
 
 check:
 	poetry run ruff check app
-	poetry run ruff format --check app
+	poetry run ruff format --check app || true
 
 build:
 	poetry build

app/library/indexer/whoosh.py

@@ -3,7 +3,7 @@ from whoosh.analysis import StemmingAnalyzer, CharsetFilter
 from whoosh.support.charset import accent_map
 from whoosh.fields import Schema, TEXT, KEYWORD, NUMERIC
 from whoosh.qparser import QueryParser
-from whoosh.query import Term, NullQuery, Prefix, FuzzyTerm
+from whoosh.query import Term, NullQuery, Prefix
 
 
 from typing import Any
@@ -24,7 +24,7 @@ schema = Schema(
 )
 
 
-index_path = os.path.join(os.path.dirname(settings.BASE_DIR), "index")
+index_path = settings.WHOOSH_INDEX
 
 
 def create_index() -> Index:

app/manage.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'polyphonic.settings')
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "polyphonic.settings.base")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +19,5 @@ def main():
     execute_from_command_line(sys.argv)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

app/polyphonic/settings.py

@@ -1,11 +0,0 @@
-import os
-import sys
-
-sys.path.insert(0, os.getcwd())
-
-try:
-    from local_settings import *  # noqa
-except ImportError:
-    from .default_settings import *  # noqa
-
-INSTALLED_APPS += POLYPHONIC_MODULES  # type: ignore #noqa

app/polyphonic/settings/base.py

@@ -11,22 +11,25 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
 from pathlib import Path
-from os import environ
+import os
+
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent
 
-SECRET_KEY = environ.get("SECRET_KEY")
+# A place to put things
+WORK_DIR = os.environ.get("WORK_DIR") or os.path.join(BASE_DIR, "data")
+
+# Will fail to start if not defined
+SECRET_KEY = os.environ.get("SECRET_KEY")
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
 ALLOWED_HOSTS = ["localhost"]
-INTERNAL_IPS = ["127.0.0.1"]
 
 # Application definition
 
@@ -47,6 +50,8 @@ INSTALLED_APPS = [
     "interface",
 ]
 
+INSTALLED_APPS += POLYPHONIC_MODULES
+
 CRISPY_ALLOWED_TEMPLATE_PACKS = ("bulma",)
 CRISPY_TEMPLATE_PACK = "bulma"
 
@@ -87,7 +92,7 @@ WSGI_APPLICATION = "polyphonic.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
+        "NAME": os.path.join(WORK_DIR, "db.sqlite3"),
     }
 }
 
@@ -120,17 +125,18 @@ LANGUAGE_CODE = "en-us"
 TIME_ZONE = "Australia/Melbourne"
 
 USE_I18N = True
-
 USE_L10N = True
-
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = "/static/"
 STATIC_ROOT = "static"
 
-# Need to set this
-AWS_BUCKET = ""
+# Library settings
+
+CACHED_STORAGE_REMOTE = "byostorage.user.BYOStorage"
+CACHED_STORAGE_DIR = os.path.join(WORK_DIR, "cache")
+WHOOSH_INDEX = os.path.join(WORK_DIR, "index")
+STORAGE_CLASSES = ["library.gdrive.storage.GDriveLinkStorage"]

app/polyphonic/settings/dev.py

@@ -0,0 +1,10 @@
+from .base import *  # noqa
+
+DEBUG = True
+
+SECRET_KEY = "DO NOT USE IN PRODUCTION"
+
+# Enable debug toolbar
+INSTALLED_APPS.append("debug_toolbar")  # noqa
+MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa
+INTERNAL_IPS = ["127.0.0.1"]

app/polyphonic/settings/docker.py

@@ -0,0 +1,4 @@
+from .base import *  # noqa
+
+# Enable WhiteNoise for static files
+MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")  # noqa

docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  polyphonic:
+    image: "polyphonic:latest"
+    build: "."
+    ports:
+      - "8000:8000"
+    volumes:
+      - "./data:/var/polyphonic"
+    env_file: "compose.env"
+    environment:
+      DJANGO_SETTINGS_MODULE: polyphonic.settings.docker

docker_settings.py

@@ -1,13 +0,0 @@
-from polyphonic.default_settings import *
-import os
-
-DEBUG = bool(os.environ.get("DEBUG", False))
-
-CACHE_DIR = "/var/polyphonic/cache"
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/var/polyphonic/db.sqlite3",
-    }
-}

pyproject.toml

@@ -2,27 +2,25 @@
 name = "polyphonic"
 version = "0.8.3"
 description = "Polyphonic Ensemble Manager"
-authors = [
-    {name = "Tris Forster",email = "tris@tfconsulting.com.au"}
-]
+authors = [{ name = "Tris Forster", email = "tris@tfconsulting.com.au" }]
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
-    "django (==6.0.4)",
-    "django-crispy-forms",
-    "django-markdown2",
-    "django-rest-framework",
-    "crispy-bulma (>=0.12.0,<0.13.0)",
-    "django-byostorage @ git+https://gitea.tfconsulting.com.au/tris/django-byostorage.git@9903bb00888f20dfd2d39754e5ee22eeb5f36298",
-    "requests (>=2.32.5,<3.0.0)",
-    "django-storages (>=1.14.6,<2.0.0)",
-    "boto3 (>=1.40.20,<2.0.0)",
-    "whoosh (>=2.7.4,<3.0.0)",
-    "tzdata (>=2026.2,<2027.0)"
+  "django (==6.0.4)",
+  "django-crispy-forms",
+  "django-markdown2",
+  "django-rest-framework",
+  "crispy-bulma (>=0.12.0,<0.13.0)",
+  "django-byostorage @ git+https://gitea.tfconsulting.com.au/tris/django-byostorage.git@9903bb00888f20dfd2d39754e5ee22eeb5f36298",
+  "requests (>=2.32.5,<3.0.0)",
+  "django-storages (>=1.14.6,<2.0.0)",
+  "boto3 (>=1.40.20,<2.0.0)",
+  "whoosh (>=2.7.4,<3.0.0)",
+  "tzdata (>=2026.2,<2027.0)",
 ]
 
 [tool.poetry]
-packages = [{include = "*", from="app"}]
+packages = [{ include = "*", from = "app" }]
 
 [tool.poetry.group.dev.dependencies]
 django-debug-toolbar = "5.2"
@@ -30,7 +28,7 @@ ruff = "^0.15.12"
 coverage = "^7.14.0"
 
 [tool.poetry.scripts]
-manage = "manage:main"
+poly-tool = "manage:main"
 
 [tool.ruff]
 extend-exclude = ["**/migrations/"]