From d610beef6858e199d4f38a191c28825331d21b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 9 Aug 2018 12:32:16 +0200
Subject: [PATCH] general: always declare django-mellon if it's available
 (#25641)

---
 debian/debian_config.py | 3 ---
 fargo/settings.py       | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/debian_config.py b/debian/debian_config.py
index 6c22868..c19d13f 100644
--- a/debian/debian_config.py
+++ b/debian/debian_config.py
@@ -4,9 +4,6 @@ import os
 
 PROJECT_NAME = 'fargo'
 
-# SAML2 authentication
-INSTALLED_APPS += ('mellon',)
-
 #
 # hobotization (multitenant)
 #
diff --git a/fargo/settings.py b/fargo/settings.py
index 39fdd05..db8cae5 100644
--- a/fargo/settings.py
+++ b/fargo/settings.py
@@ -125,6 +125,7 @@ LOGOUT_URL = '/logout/'
 # Authentication settings
 try:
     import mellon
+    INSTALLED_APPS = INSTALLED_APPS + ('mellon',)
 except ImportError:
     mellon = None
 
-- 
2.18.0