diff options
author | Rob Austein <sra@hactrn.net> | 2014-09-16 18:29:46 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2014-09-16 18:29:46 +0000 |
commit | 180a9c09f9705283e11caa2df408e6b2353f3b9d (patch) | |
tree | a0861ddd006017e9f4fe754bd1abefa36a9a73cb /ca/rpki.wsgi | |
parent | c02686daf6dcc4175f119adc5d19261f577b2856 (diff) | |
parent | 7c2fb9ca36f120369797072e534041daae6cd8f9 (diff) |
Merge changes from branches/tk713 into branches/tk705. See #705, #713.
svn path=/branches/tk705/; revision=5956
Diffstat (limited to 'ca/rpki.wsgi')
-rw-r--r-- | ca/rpki.wsgi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ca/rpki.wsgi b/ca/rpki.wsgi index 72ba75ac..7fa85d73 100644 --- a/ca/rpki.wsgi +++ b/ca/rpki.wsgi @@ -21,7 +21,8 @@ import sys import os import rpki.autoconf -os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.default_settings' +os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings", + RPKI_GUI_ENABLE = "yes") # Needed for local_settings.py sys.path.insert(1, rpki.autoconf.sysconfdir + '/rpki') |