Merge tag 'v3.7.0' into develop

v3.7.0
yverdon · May 29, 2024 · 552b08a · 552b08a
2 parents 7e8928a + fc568eb
commit 552b08a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
         ENV: PROD
     depends_on:
       - statics_builder
-    # entrypoint: /code/entrypoint.sh
+    entrypoint: /code/entrypoint.sh
     command: "gunicorn geocity.wsgi -b :9000 --error-logfile gunicorn_log.log --workers=2 --threads=4 --worker-class=gthread"
     volumes:
       - ${PRIVATE_DOCUMENTS_DIR}:/private_documents

diff --git a/geocity/settings.py b/geocity/settings.py
@@ -42,7 +42,11 @@
 
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
-CSRF_TRUSTED_ORIGINS = os.getenv("CSRF_TRUSTED_ORIGINS").split(",")
+CSRF_TRUSTED_ORIGINS = (
+    os.getenv("CSRF_TRUSTED_ORIGINS").split(",")
+    if os.getenv("CSRF_TRUSTED_ORIGINS")
+    else []
+)
 
 
 # SESSION TIMEOUT

diff --git a/services/pdf/requirements.txt b/services/pdf/requirements.txt
@@ -28,7 +28,7 @@ pydyf==0.9.0
     # via weasyprint
 pyphen==0.14.0
     # via weasyprint
-requests==2.31.0
+requests==2.32.0
     # via -r requirements.in
 six==1.16.0
     # via html5lib