Projet

Général

Profil

0001-debian-use-MIDDLEWARE-in-debian_config_common.py-365.patch

Benjamin Dauvergne, 01 octobre 2019 16:25

Télécharger (4,35 ko)

Voir les différences:

Subject: [PATCH] debian: use MIDDLEWARE in debian_config_common.py (#36584)

 debian/debian_config_common.py | 78 ++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 23 deletions(-)
debian/debian_config_common.py
11 11
import os
12 12
import warnings
13 13

  
14
import django
14 15
from django.conf import global_settings
15 16
from django.core.exceptions import ImproperlyConfigured
16 17

  
......
230 231
# make it easier to use runserver behind nginx as reverse proxy
231 232
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
232 233

  
233
if not 'MIDDLEWARE_CLASSES' in globals():
234
    MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES
234
if 'MIDDLEWARE' not in globals():
235
    MIDDLEWARE = global_settings.MIDDLEWARE
235 236

  
236
MIDDLEWARE_CLASSES = (
237
    'hobo.middleware.VersionMiddleware', # /__version__
238
    'hobo.middleware.cors.CORSMiddleware',
239
) + MIDDLEWARE_CLASSES
237
if 'MIDDLEWARE_CLASSES' in globals():
238
    MIDDLEWARE_CLASSES = (
239
        'hobo.middleware.VersionMiddleware',  # /__version__
240
        'hobo.middleware.cors.CORSMiddleware',
241
    ) + MIDDLEWARE_CLASSES
240 242

  
241
if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
242
    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
243
        'mellon.middleware.PassiveAuthenticationMiddleware',
244
    )
243
    if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
244
        MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
245
            'mellon.middleware.PassiveAuthenticationMiddleware',
246
        )
245 247

  
246
if 'authentic2' in INSTALLED_APPS:
247
    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
248
        'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
249
    )
248
    if 'authentic2' in INSTALLED_APPS:
249
        MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
250
            'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
251
        )
252
else:
253
    MIDDLEWARE = (
254
        'hobo.middleware.VersionMiddleware',  # /__version__
255
        'hobo.middleware.cors.CORSMiddleware',
256
    ) + MIDDLEWARE
257

  
258
    if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
259
        MIDDLEWARE = MIDDLEWARE + (
260
            'mellon.middleware.PassiveAuthenticationMiddleware',
261
        )
262

  
263
    if 'authentic2' in INSTALLED_APPS:
264
        MIDDLEWARE = MIDDLEWARE + (
265
            'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
266
        )
250 267

  
251 268

  
252 269
if PROJECT_NAME != 'wcs':
......
255 272
    TENANT_BASE = os.path.join(VAR_DIR, 'tenants')
256 273
    TENANT_MODEL = 'multitenant.Tenant'
257 274

  
258
    MIDDLEWARE_CLASSES = (
259
        'hobo.multitenant.middleware.TenantMiddleware',
260
    ) + MIDDLEWARE_CLASSES
275
    if 'MIDDLEWARE_CLASSES' in globals():
276
        MIDDLEWARE_CLASSES = (
277
            'hobo.multitenant.middleware.TenantMiddleware',
278
        ) + MIDDLEWARE_CLASSES
279
    else:
280
        MIDDLEWARE = (
281
            'hobo.multitenant.middleware.TenantMiddleware',
282
        ) + MIDDLEWARE
261 283

  
262 284
    DATABASES = {
263 285
        'default': {
......
325 347
    MELLON_OPENED_SESSION_COOKIE_NAME = 'A2_OPENED_SESSION'
326 348
    MELLON_ADD_AUTHNREQUEST_NEXT_URL_EXTENSION = True
327 349

  
328
MIDDLEWARE_CLASSES = (
329
    'hobo.middleware.utils.StoreRequestMiddleware',
330
    'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
331
) + MIDDLEWARE_CLASSES
350
if 'MIDDLEWARE_CLASSES' in globals():
351
    MIDDLEWARE_CLASSES = (
352
        'hobo.middleware.utils.StoreRequestMiddleware',
353
        'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
354
    ) + MIDDLEWARE_CLASSES
355

  
356
    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
357
        'hobo.middleware.PrometheusStatsMiddleware',)
358
else:
359
    MIDDLEWARE = (
360
        'hobo.middleware.utils.StoreRequestMiddleware',
361
        'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
362
    ) + MIDDLEWARE
363

  
364
    MIDDLEWARE = MIDDLEWARE + (
365
        'hobo.middleware.PrometheusStatsMiddleware',)
332 366

  
333
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
334
    'hobo.middleware.PrometheusStatsMiddleware',)
335 367

  
336 368
HOBO_MANAGER_HOMEPAGE_URL_VAR = 'portal_agent_url'
337 369
HOBO_MANAGER_HOMEPAGE_TITLE_VAR = 'portal_agent_title'
338
-