Merge pull request #17 from maykinmedia/feature/refactor-settings

🔧 [open-zaak/open-zaak#1629] Refactor base settings
maykinmedia · Jul 11, 2024 · f8b8fdf · f8b8fdf
2 parents 4a777b8 + 5f1b466
commit f8b8fdf
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 426 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,20 @@
 Change history
 ==============
 
+0.2.0
+=====
+
+*?? ??, 2024*
+
+.. warning::
+
+   Deployment tooling updates required - additional containers needed.
+
+   Redis is now required as a cache backend, make sure to add and configure a Redis container
+
+.. warning::
+
+   Two factor authentication was added (by default it is enabled, to disable it, set the ``DISABLE_2FA`` envvar to ``True``)
 
 0.1.0
 =====

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,6 +12,9 @@ services:
     volumes:
       - ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql
 
+  redis:
+    image: redis
+
   web:
     build: .
     image: maykinmedia/referentielijsten-api:latest
@@ -21,12 +24,17 @@ services:
       - DB_NAME=referentielijsten
       - DB_USER=referentielijsten
       - DB_HOST=db
+      - CACHE_DEFAULT=redis:6379/0
+      - CACHE_AXES=redis:6379/0
+      - SUBPATH=${SUBPATH:-/}
+      - DISABLE_2FA=${DISABLE_2FA:-True}
       # Only allow all hosts for development/testing purposes!
       - ALLOWED_HOSTS=*
     ports:
       - 8000:8000
     depends_on:
       - db
+      - redis
 
 # See: src/referentielijsten/conf/docker.py
 # Optional containers below:

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -74,12 +74,14 @@ django==4.2.11
     # via
     #   commonground-api-common
     #   django-admin-index
+    #   django-appconf
     #   django-axes
     #   django-cors-headers
     #   django-filter
     #   django-formtools
     #   django-import-export
     #   django-jsonform
+    #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
     #   django-phonenumber-field
@@ -88,6 +90,7 @@ django==4.2.11
     #   django-relativedelta
     #   django-rest-framework-condition
     #   django-sendfile2
+    #   django-setup-configuration
     #   django-simple-certmanager
     #   django-solo
     #   django-two-factor-auth
@@ -104,6 +107,8 @@ django==4.2.11
     #   zgw-consumers
 django-admin-index==3.1.1
     # via open-api-framework
+django-appconf==1.0.6
+    # via django-log-outgoing-requests
 django-axes==6.4.0
     # via open-api-framework
 django-cors-headers==4.3.1
@@ -120,6 +125,8 @@ django-jsonform==2.22.0
     # via
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-log-outgoing-requests==0.6.1
+    # via open-api-framework
 django-markup==1.8.1
     # via open-api-framework
 django-ordered-model==3.7.4
@@ -138,11 +145,14 @@ django-rest-framework-condition==0.1.1
     # via commonground-api-common
 django-sendfile2==0.7.1
     # via django-privates
+django-setup-configuration==0.1.0
+    # via open-api-framework
 django-simple-certmanager==2.0.0
     # via zgw-consumers
 django-solo==2.2.0
     # via
     #   commonground-api-common
+    #   django-log-outgoing-requests
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -224,7 +234,7 @@ mozilla-django-oidc-db==0.15.0
     # via open-api-framework
 notifications-api-common==0.2.2
     # via commonground-api-common
-open-api-framework==0.2.0
+open-api-framework==0.6.0
     # via -r requirements/base.in
 openpyxl==3.1.4
     # via tablib
@@ -286,6 +296,7 @@ requests==2.31.0
     #   ape-pie
     #   commonground-api-common
     #   coreapi
+    #   django-log-outgoing-requests
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -120,12 +120,14 @@ django==4.2.11
     #   -r requirements/base.txt
     #   commonground-api-common
     #   django-admin-index
+    #   django-appconf
     #   django-axes
     #   django-cors-headers
     #   django-filter
     #   django-formtools
     #   django-import-export
     #   django-jsonform
+    #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
     #   django-phonenumber-field
@@ -134,6 +136,7 @@ django==4.2.11
     #   django-relativedelta
     #   django-rest-framework-condition
     #   django-sendfile2
+    #   django-setup-configuration
     #   django-simple-certmanager
     #   django-solo
     #   django-two-factor-auth
@@ -152,6 +155,10 @@ django-admin-index==3.1.1
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+django-appconf==1.0.6
+    # via
+    #   -r requirements/base.txt
+    #   django-log-outgoing-requests
 django-axes==6.4.0
     # via
     #   -r requirements/base.txt
@@ -176,6 +183,10 @@ django-jsonform==2.22.0
     #   -r requirements/base.txt
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-log-outgoing-requests==0.6.1
+    # via
+    #   -r requirements/base.txt
+    #   open-api-framework
 django-markup==1.8.1
     # via
     #   -r requirements/base.txt
@@ -212,6 +223,10 @@ django-sendfile2==0.7.1
     # via
     #   -r requirements/base.txt
     #   django-privates
+django-setup-configuration==0.1.0
+    # via
+    #   -r requirements/base.txt
+    #   open-api-framework
 django-simple-certmanager==2.0.0
     # via
     #   -r requirements/base.txt
@@ -220,6 +235,7 @@ django-solo==2.2.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
+    #   django-log-outgoing-requests
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -377,7 +393,7 @@ notifications-api-common==0.2.2
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-open-api-framework==0.2.0
+open-api-framework==0.6.0
     # via -r requirements/base.txt
 openpyxl==3.1.4
     # via
@@ -485,6 +501,7 @@ requests==2.31.0
     #   ape-pie
     #   commonground-api-common
     #   coreapi
+    #   django-log-outgoing-requests
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -161,6 +161,7 @@ django==4.2.11
     #   -r requirements/ci.txt
     #   commonground-api-common
     #   django-admin-index
+    #   django-appconf
     #   django-axes
     #   django-cors-headers
     #   django-debug-toolbar
@@ -169,6 +170,7 @@ django==4.2.11
     #   django-formtools
     #   django-import-export
     #   django-jsonform
+    #   django-log-outgoing-requests
     #   django-markup
     #   django-otp
     #   django-phonenumber-field
@@ -177,6 +179,7 @@ django==4.2.11
     #   django-relativedelta
     #   django-rest-framework-condition
     #   django-sendfile2
+    #   django-setup-configuration
     #   django-simple-certmanager
     #   django-solo
     #   django-two-factor-auth
@@ -196,6 +199,11 @@ django-admin-index==3.1.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   open-api-framework
+django-appconf==1.0.6
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   django-log-outgoing-requests
 django-axes==6.4.0
     # via
     #   -c requirements/ci.txt
@@ -231,6 +239,11 @@ django-jsonform==2.22.0
     #   -r requirements/ci.txt
     #   mozilla-django-oidc-db
     #   open-api-framework
+django-log-outgoing-requests==0.6.1
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   open-api-framework
 django-markup==1.8.1
     # via
     #   -c requirements/ci.txt
@@ -276,6 +289,11 @@ django-sendfile2==0.7.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-privates
+django-setup-configuration==0.1.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   open-api-framework
 django-simple-certmanager==2.0.0
     # via
     #   -c requirements/ci.txt
@@ -286,6 +304,7 @@ django-solo==2.2.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   commonground-api-common
+    #   django-log-outgoing-requests
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -506,7 +525,7 @@ notifications-api-common==0.2.2
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   commonground-api-common
-open-api-framework==0.2.0
+open-api-framework==0.6.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -659,6 +678,7 @@ requests==2.31.0
     #   ape-pie
     #   commonground-api-common
     #   coreapi
+    #   django-log-outgoing-requests
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework