diff options
| author | user@node5.net <user@node5.net> | 2025-12-07 21:22:04 +0100 |
|---|---|---|
| committer | user@node5.net <user@node5.net> | 2025-12-07 21:22:04 +0100 |
| commit | 7f37e43c940cdb7a9adf38021331a97cf7664b9b (patch) | |
| tree | 4f1dce1813ae0dccdba723e2f7a72e5fbcfc6d3c /web_interface | |
| parent | 9967265fc20e4f3ee3a222330fcb83b15ffe223d (diff) | |
Fix static + more config for running
Diffstat (limited to 'web_interface')
| -rw-r--r-- | web_interface/Makefile | 2 | ||||
| -rw-r--r-- | web_interface/drinks_machine/settings.py | 6 | ||||
| -rw-r--r-- | web_interface/uv.lock | 31 |
3 files changed, 28 insertions, 11 deletions
diff --git a/web_interface/Makefile b/web_interface/Makefile index e5f4d7e..defe817 100644 --- a/web_interface/Makefile +++ b/web_interface/Makefile @@ -16,4 +16,4 @@ user: uv run manage.py createsuperuser run_dev: - uv run manage.py runserver + DEBUG=INSECURE uv run manage.py runserver diff --git a/web_interface/drinks_machine/settings.py b/web_interface/drinks_machine/settings.py index 738e5ba..b63d78f 100644 --- a/web_interface/drinks_machine/settings.py +++ b/web_interface/drinks_machine/settings.py @@ -51,8 +51,9 @@ SECRET_KEY = secret_key # SECURITY WARNING: don't run with debug turned on in production! DEBUG = "DEBUG" in os.environ and os.environ["DEBUG"] == "INSECURE" +print(f"Debug is: {'on' if DEBUG else 'off'}") -ALLOWED_HOSTS = ['drinks-machine.node5.net'] +ALLOWED_HOSTS = ['127.0.0.1', 'drinks-machine.node5.net'] # Application definition @@ -143,5 +144,6 @@ USE_TZ = True # https://docs.djangoproject.com/en/6.0/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, "static") +#STATIC_ROOT = os.path.join(BASE_DIR, "static") +STATICFILES_DIRS = [BASE_DIR / "static"] diff --git a/web_interface/uv.lock b/web_interface/uv.lock index ebc283f..acff492 100644 --- a/web_interface/uv.lock +++ b/web_interface/uv.lock @@ -48,18 +48,39 @@ dependencies = [ [package.optional-dependencies] prod = [ - { name = "uwsgi" }, + { name = "gunicorn" }, ] [package.metadata] requires-dist = [ { name = "django", specifier = "==5.2.9" }, { name = "django-colorfield", specifier = "==0.14.0" }, - { name = "uwsgi", marker = "extra == 'prod'", specifier = "==2.0.31" }, + { name = "gunicorn", marker = "extra == 'prod'", specifier = "==23.0.0" }, ] provides-extras = ["dev", "prod"] [[package]] +name = "gunicorn" +version = "23.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/34/72/9614c465dc206155d93eff0ca20d42e1e35afc533971379482de953521a4/gunicorn-23.0.0.tar.gz", hash = "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec", size = 375031, upload-time = "2024-08-10T20:25:27.378Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/7d/6dac2a6e1eba33ee43f318edbed4ff29151a49b5d37f080aad1e6469bca4/gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d", size = 85029, upload-time = "2024-08-10T20:25:24.996Z" }, +] + +[[package]] +name = "packaging" +version = "25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" }, +] + +[[package]] name = "pillow" version = "12.0.0" source = { registry = "https://pypi.org/simple" } @@ -163,9 +184,3 @@ sdist = { url = "https://files.pythonhosted.org/packages/95/32/1a225d6164441be76 wheels = [ { url = "https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl", hash = "sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8", size = 347839, upload-time = "2025-03-23T13:54:41.845Z" }, ] - -[[package]] -name = "uwsgi" -version = "2.0.31" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9f/49/2f57640e889ba509fd1fae10cccec1b58972a07c2724486efba94c5ea448/uwsgi-2.0.31.tar.gz", hash = "sha256:e8f8b350ccc106ff93a65247b9136f529c14bf96b936ac5b264c6ff9d0c76257", size = 822796, upload-time = "2025-10-11T19:17:28.794Z" } |
