move auditlog in settings.dist.py

Author: Valentijn Scholten

dojo/settings/settings.dist.py

@@ -711,6 +711,7 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
 SIMILAR_FINDINGS_MAX_RESULTS = env("DD_SIMILAR_FINDINGS_MAX_RESULTS")
 MAX_REQRESP_FROM_API = env("DD_MAX_REQRESP_FROM_API")
 MAX_AUTOCOMPLETE_WORDS = env("DD_MAX_AUTOCOMPLETE_WORDS")
+ENABLE_AUDITLOG = env("DD_ENABLE_AUDITLOG")
 
 LOGIN_EXEMPT_URLS = (
     rf"^{URL_PREFIX}static/",
@@ -975,6 +976,15 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
 
 MIDDLEWARE = DJANGO_MIDDLEWARE_CLASSES
 
+if ENABLE_AUDITLOG:
+    middleware_list = list(MIDDLEWARE)
+    crum_index = middleware_list.index("crum.CurrentRequestUserMiddleware")
+
+    # Insert pghistory HistoryMiddleware before CurrentRequestUserMiddleware
+    middleware_list.insert(crum_index, "dojo.middleware.PgHistoryMiddleware")
+
+    MIDDLEWARE = middleware_list
+
 # WhiteNoise allows your web app to serve its own static files,
 # making it a self-contained unit that can be deployed anywhere without relying on nginx
 if env("DD_WHITENOISE"):
@@ -1982,7 +1992,6 @@ def saml2_attrib_map_format(din):
 # Auditlog
 # ------------------------------------------------------------------------------
 AUDITLOG_FLUSH_RETENTION_PERIOD = env("DD_AUDITLOG_FLUSH_RETENTION_PERIOD")
-ENABLE_AUDITLOG = env("DD_ENABLE_AUDITLOG")
 AUDITLOG_FLUSH_BATCH_SIZE = env("DD_AUDITLOG_FLUSH_BATCH_SIZE")
 AUDITLOG_FLUSH_MAX_BATCHES = env("DD_AUDITLOG_FLUSH_MAX_BATCHES")
 
@@ -2074,15 +2083,6 @@ def show_toolbar(request):
 # Auditlog configuration                                                                                #
 #########################################################################################################
 
-if ENABLE_AUDITLOG:
-    middleware_list = list(MIDDLEWARE)
-    crum_index = middleware_list.index("crum.CurrentRequestUserMiddleware")
-
-    # Insert pghistory HistoryMiddleware before CurrentRequestUserMiddleware
-    middleware_list.insert(crum_index, "dojo.middleware.PgHistoryMiddleware")
-
-    MIDDLEWARE = middleware_list
-
 PGHISTORY_FOREIGN_KEY_FIELD = pghistory.ForeignKey(db_index=False)
 PGHISTORY_CONTEXT_FIELD = pghistory.ContextForeignKey(db_index=True)
 PGHISTORY_OBJ_FIELD = pghistory.ObjForeignKey(db_index=True)