From c43721be5e332f9ac1ec954257e688a870fa40c9 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 13 Feb 2015 15:08:45 +0100
Subject: [PATCH] Rename environment variable DJANGO_CONFIG_FILE to
 AUTHENTIC2_CONFIG

---
 authentic2-ctl             | 4 +---
 src/authentic2/settings.py | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/authentic2-ctl b/authentic2-ctl
index a7769392e..fd677a96b 100755
--- a/authentic2-ctl
+++ b/authentic2-ctl
@@ -11,9 +11,7 @@ if __name__ == "__main__":
         argv.pop(0)
 
     if config_file:
-        os.environ['DJANGO_CONFIG_FILE'] = config_file
-    elif os.path.exists('./local_settings.py'):
-        os.environ['DJANGO_CONFIG_FILE'] = './local_settings.py'
+        os.environ['AUTHENTIC2_SETTINGS_FILE'] = config_file
 
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "authentic2.settings")
 
diff --git a/src/authentic2/settings.py b/src/authentic2/settings.py
index 38a81d4a3..059b14dde 100644
--- a/src/authentic2/settings.py
+++ b/src/authentic2/settings.py
@@ -247,8 +247,8 @@ LOGGING = {
 # Load configuration file
 #
 
-if 'DJANGO_CONFIG_FILE' in os.environ:
-    execfile(os.environ['DJANGO_CONFIG_FILE'])
+if 'AUTHENTIC2_SETTINGS_FILE' in os.environ:
+    execfile(os.environ['AUTHENTIC2_SETTINGS_FILE'])
 
 #
 # Apply monkey patches