From 584bbda0f2af0a097968ad55beb9e9c7db2b98eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 15 Feb 2015 10:40:07 +0100
Subject: [PATCH] general: use a specific variable name for local settings
 filename (#6515)

---
 authentic2-ctl         | 14 +-------------
 authentic2/settings.py |  6 ++++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/authentic2-ctl b/authentic2-ctl
index a776939..4c5c04f 100755
--- a/authentic2-ctl
+++ b/authentic2-ctl
@@ -3,20 +3,8 @@ import os
 import sys
 
 if __name__ == "__main__":
-    config_file = False
-
-    argv = sys.argv[1:]
-    if argv and argv[0].startswith('--config='):
-        config_file = argv[0].split('=')[1]
-        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.setdefault("DJANGO_SETTINGS_MODULE", "authentic2.settings")
 
     from django.core.management import execute_from_command_line
 
-    execute_from_command_line(sys.argv[:1] + argv)
+    execute_from_command_line(sys.argv)
diff --git a/authentic2/settings.py b/authentic2/settings.py
index 20d6852..801bbed 100644
--- a/authentic2/settings.py
+++ b/authentic2/settings.py
@@ -257,8 +257,10 @@ LOGGING = {
 # Load configuration file
 #
 
-if 'DJANGO_CONFIG_FILE' in os.environ:
-    execfile(os.environ['DJANGO_CONFIG_FILE'])
+local_settings_file = os.environ.get('AUTHENTIC_SETTINGS_FILE',
+        os.path.join(os.path.dirname(__file__), 'local_settings.py'))
+if os.path.exists(local_settings_file):
+    execfile(local_settings_file)
 
 #
 # Apply monkey patches
-- 
2.1.4