aboutsummaryrefslogtreecommitdiff
path: root/ca/irbe_cli
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-10-05 17:42:22 +0000
committerRob Austein <sra@hactrn.net>2014-10-05 17:42:22 +0000
commit7d250756df425252344d29c54256ca141b915ed3 (patch)
tree767e199979f05abf950b918f49c06fe7e14d8697 /ca/irbe_cli
parent4598ade64714fcbba5b8785ba84533522254708b (diff)
parentd4f19b6a2957b11d286b1306cc1b209ee18e200c (diff)
Pull from trunk.
svn path=/branches/tk705/; revision=5988
Diffstat (limited to 'ca/irbe_cli')
-rwxr-xr-xca/irbe_cli5
1 files changed, 5 insertions, 0 deletions
diff --git a/ca/irbe_cli b/ca/irbe_cli
index de907ca7..d425095b 100755
--- a/ca/irbe_cli
+++ b/ca/irbe_cli
@@ -325,6 +325,7 @@ if True:
os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings")
else:
+ import django
from django.conf import settings
settings.configure(
DATABASES = { "default" : {
@@ -336,7 +337,11 @@ else:
"PORT" : "",
"OPTIONS" : { "init_command": "SET storage_engine=INNODB" }}},
INSTALLED_APPS = ("rpki.irdb",),
+ MIDDLEWARE_CLASSES = (),
)
+ if django.VERSION >= (1, 7):
+ from django.apps import apps
+ apps.populate(settings.INSTALLED_APPS)
import rpki.irdb