Cleanup and adjustment for test in docker stack.

Author: MarcoSteinacher

django/Dockerfile

@@ -19,10 +19,11 @@ RUN ./install_dependencies.sh -e docker
 # install gunicorn and whitenoise (if not already installed via dependencies script)
 RUN pip install --no-cache-dir gunicorn whitenoise
 # optional gunicorn tuning vars
-ENV GUNICORN_WORKERS=2 \
-    GUNICORN_BIND=0.0.0.0:8000 \
-    GUNICORN_TIMEOUT=120 \
-    DJANGO_DEBUG=1
+ENV GUNICORN_WORKERS=2
+ENV GUNICORN_BIND=0.0.0.0:8000
+ENV GUNICORN_LOG_LEVEL=info
+#ENV GUNICORN_TIMEOUT=120
+#ENV DJANGO_DEBUG=1
 EXPOSE 8000
 
 FROM cohiva-platform-django AS cohiva-platform-app
@@ -43,4 +44,6 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--log-level", "info", "cohiva.wsgi:application"]
+#ENV GUNICORN_CMD_ARGS="--workers ${GUNICORN_WORKERS} --bind ${GUNICORN_BIND} --timeout ${GUNICORN_TIMEOUT}"
+ENV GUNICORN_CMD_ARGS="--workers ${GUNICORN_WORKERS} --bind ${GUNICORN_BIND} --log-level ${GUNICORN_LOG_LEVEL}}"
+CMD ["gunicorn", "cohiva.wsgi:application"]

django/cohiva/base_config_example.py

@@ -15,6 +15,9 @@
 # Container IP address, if you run Cohiva in Docker (optional, comment out to disable).
 DOCKER_IP = "172.20.42.100"
 
+# Use Whitenoise to serve static files in production (https://whitenoise.readthedocs.io/en/stable/django.html)
+USE_WHITENOISE = False
+
 SITE_NAME = "Genossenschaft Musterweg"
 SITE_NICKNAME = "Musterweg"
 SITE_SECRET = "<SECRET>"
@@ -37,9 +40,9 @@
 FEATURES = [
     "api",
     "portal",
-    "reservation",
+    "reservation",  # currently required by api
     "report",
-    "credit_accounting",
+    "credit_accounting",  # currently required by geno
     "website",
-    "cms",
+    "cms",  # currently required by portal
 ]

django/cohiva/middleware.py

@@ -2,6 +2,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class RequestDebugMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
@@ -11,8 +12,8 @@ def __call__(self, request):
         logger.error(f"HOST: {request.META.get('HTTP_HOST', 'NO_HOST')}")
         logger.error(f"USER_AGENT: {request.META.get('HTTP_USER_AGENT', 'NO_UA')}")
         logger.error(f"REMOTE_ADDR: {request.META.get('REMOTE_ADDR', 'NO_ADDR')}")
-        
+
         response = self.get_response(request)
-        
+
         logger.error(f"RESPONSE: {response.status_code}")
         return response

django/cohiva/settings_defaults.py

@@ -1,12 +1,19 @@
 """
-Django default settings for Cohiva.
+Django default base settings for Cohiva.
 
 To change settings, overwrite them in settings.py or settings_production.py
+
+NOTE: Settings are cascaded in the following order (settings in the later files override/extend
+      settings in the earlier files):
+
+  1. settings_defaults.py (default base settings)
+  2. settings.py (custom base settings)
+  3. settings_production_defaults.py (default production settings)
+  4. settings_production.py (custom production settings)
 """
 
 import datetime
 import locale
-import os
 from pathlib import Path
 from urllib.parse import quote
 
@@ -274,8 +281,10 @@
         "portal.middleware.SecondaryPortalMiddleware",
         "oauth2_provider.middleware.OAuth2TokenMiddleware",  ## For Oauth2 token authentication
     )
+MIDDLEWARE += ("django.middleware.security.SecurityMiddleware",)
+if getattr(cbc, "USE_WHITENOISE", False):
+    MIDDLEWARE += ("whitenoise.middleware.WhiteNoiseMiddleware",)
 MIDDLEWARE += (
-    "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     # LocaleMiddleware MUST be after SessionMiddleware (needs session data for language preferences)
     # and BEFORE CommonMiddleware (needs to process language before URL resolution)
@@ -427,12 +436,10 @@
     },
     "staticfiles": {
         "BACKEND": "cohiva.storage.CacheBustingStaticFilesStorage",
+        # BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
     },
 }
 
-## For production, use ManifestStaticFilesStorage instead (requires collectstatic):
-##STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
-
 # Additional locations of static files
 # STATICFILES_DIRS = (
 #    BASE_DIR / 'static',
@@ -585,16 +592,18 @@
 ## django-filer - https://django-filer.readthedocs.io/en/latest/settings.html
 FILER_ENABLE_PERMISSIONS = True
 FILER_IS_PUBLIC_DEFAULT = False
-FILER_SERVERS = {
-    "private": {
-        "main": {
-            "ENGINE": "filer.server.backends.xsendfile.ApacheXSendfileServer",
-        },
-        "thumbnails": {
-            "ENGINE": "filer.server.backends.xsendfile.ApacheXSendfileServer",
-        },
-    },
-}
+## Use upstream Apache to serve private files with X-Sendfile
+## (instead of the default filer.server.backends.default.DefaultServer backend)
+# FILER_SERVERS = {
+#    "private": {
+#        "main": {
+#            "ENGINE": "filer.server.backends.xsendfile.ApacheXSendfileServer",
+#        },
+#        "thumbnails": {
+#            "ENGINE": "filer.server.backends.xsendfile.ApacheXSendfileServer",
+#        },
+#    },
+# }
 
 ## Celery with redis
 CELERY_BROKER_URL = "redis://localhost:6379/0"
@@ -1408,23 +1417,3 @@
 # Crispy Forms Configuration for Unfold
 CRISPY_TEMPLATE_PACK = "unfold_crispy"
 CRISPY_ALLOWED_TEMPLATE_PACKS = ["unfold_crispy"]
-
-
-# Add WhiteNoise for static file serving
-MIDDLEWARE = [
-    'whitenoise.middleware.WhiteNoiseMiddleware',
-] + list(MIDDLEWARE)
-
-# Static files configuration
-STATIC_ROOT = "/tmp/static"  # Temporary location for collected static files
-STATIC_URL = "/static/"
-
-# Use simpler WhiteNoise backend without compression
-STORAGES = {
-    "default": {
-        "BACKEND": "django.core.files.storage.FileSystemStorage",
-    },
-    "staticfiles": {
-        "BACKEND": "whitenoise.storage.StaticFilesStorage",
-    },
-}

django/cohiva/settings_docker.py

@@ -1,5 +1,14 @@
-## Settings for test/development environment
-## For production settings use settings_production.py
+"""
+Django custom base settings for Cohiva.
+
+NOTE: Settings are cascaded in the following order (settings in the later files override/extend
+      settings in the earlier files):
+
+  1. settings_defaults.py (default base settings)
+  2. settings.py (custom base settings)
+  3. settings_production_defaults.py (default production settings)
+  4. settings_production.py (custom production settings)
+"""
 
 ## Load default test settings
 from .settings_defaults import *  # noqa: F403