entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 33 Releases Activity

Rename environment variable DJANGO_CONFIG_FILE to AUTHENTIC2_CONFIG

This commit is contained in:
Benjamin Dauvergne 2015-02-13 15:08:45 +01:00
parent 31927d1c61
commit c43721be5e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
authentic2-ctl
View File

@ -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")

4
src/authentic2/settings.py
View File

@ -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