From 7889c0cc04a734f4f08ab50ed51138cb52eb40a0 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 1 Oct 2019 16:24:01 +0200
Subject: [PATCH] debian: use MIDDLEWARE in debian_config_common.py (#36584)

---
 debian/debian_config_common.py | 78 ++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/debian/debian_config_common.py b/debian/debian_config_common.py
index 92f5cba..edf859b 100644
--- a/debian/debian_config_common.py
+++ b/debian/debian_config_common.py
@@ -11,6 +11,7 @@
 import os
 import warnings
 
+import django
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 
@@ -230,23 +231,39 @@ SESSION_ENGINE = 'mellon.sessions_backends.cached_db'
 # make it easier to use runserver behind nginx as reverse proxy
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
-if not 'MIDDLEWARE_CLASSES' in globals():
-    MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES
+if 'MIDDLEWARE' not in globals():
+    MIDDLEWARE = global_settings.MIDDLEWARE
 
-MIDDLEWARE_CLASSES = (
-    'hobo.middleware.VersionMiddleware', # /__version__
-    'hobo.middleware.cors.CORSMiddleware',
-) + MIDDLEWARE_CLASSES
+if 'MIDDLEWARE_CLASSES' in globals():
+    MIDDLEWARE_CLASSES = (
+        'hobo.middleware.VersionMiddleware',  # /__version__
+        'hobo.middleware.cors.CORSMiddleware',
+    ) + MIDDLEWARE_CLASSES
 
-if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
-    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
-        'mellon.middleware.PassiveAuthenticationMiddleware',
-    )
+    if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
+        MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+            'mellon.middleware.PassiveAuthenticationMiddleware',
+        )
 
-if 'authentic2' in INSTALLED_APPS:
-    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
-        'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
-    )
+    if 'authentic2' in INSTALLED_APPS:
+        MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+            'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
+        )
+else:
+    MIDDLEWARE = (
+        'hobo.middleware.VersionMiddleware',  # /__version__
+        'hobo.middleware.cors.CORSMiddleware',
+    ) + MIDDLEWARE
+
+    if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
+        MIDDLEWARE = MIDDLEWARE + (
+            'mellon.middleware.PassiveAuthenticationMiddleware',
+        )
+
+    if 'authentic2' in INSTALLED_APPS:
+        MIDDLEWARE = MIDDLEWARE + (
+            'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
+        )
 
 
 if PROJECT_NAME != 'wcs':
@@ -255,9 +272,14 @@ if PROJECT_NAME != 'wcs':
     TENANT_BASE = os.path.join(VAR_DIR, 'tenants')
     TENANT_MODEL = 'multitenant.Tenant'
 
-    MIDDLEWARE_CLASSES = (
-        'hobo.multitenant.middleware.TenantMiddleware',
-    ) + MIDDLEWARE_CLASSES
+    if 'MIDDLEWARE_CLASSES' in globals():
+        MIDDLEWARE_CLASSES = (
+            'hobo.multitenant.middleware.TenantMiddleware',
+        ) + MIDDLEWARE_CLASSES
+    else:
+        MIDDLEWARE = (
+            'hobo.multitenant.middleware.TenantMiddleware',
+        ) + MIDDLEWARE
 
     DATABASES = {
         'default': {
@@ -325,13 +347,23 @@ if 'authentic2' not in INSTALLED_APPS:
     MELLON_OPENED_SESSION_COOKIE_NAME = 'A2_OPENED_SESSION'
     MELLON_ADD_AUTHNREQUEST_NEXT_URL_EXTENSION = True
 
-MIDDLEWARE_CLASSES = (
-    'hobo.middleware.utils.StoreRequestMiddleware',
-    'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
-) + MIDDLEWARE_CLASSES
+if 'MIDDLEWARE_CLASSES' in globals():
+    MIDDLEWARE_CLASSES = (
+        'hobo.middleware.utils.StoreRequestMiddleware',
+        'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
+    ) + MIDDLEWARE_CLASSES
+
+    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+        'hobo.middleware.PrometheusStatsMiddleware',)
+else:
+    MIDDLEWARE = (
+        'hobo.middleware.utils.StoreRequestMiddleware',
+        'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
+    ) + MIDDLEWARE
+
+    MIDDLEWARE = MIDDLEWARE + (
+        'hobo.middleware.PrometheusStatsMiddleware',)
 
-MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
-    'hobo.middleware.PrometheusStatsMiddleware',)
 
 HOBO_MANAGER_HOMEPAGE_URL_VAR = 'portal_agent_url'
 HOBO_MANAGER_HOMEPAGE_TITLE_VAR = 'portal_agent_title'
-- 
2.23.0