diff options
Diffstat (limited to 'ca')
| -rwxr-xr-x | ca/irbe_cli | 7 | ||||
| -rw-r--r-- | ca/tests/yamlconf.py | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ca/irbe_cli b/ca/irbe_cli index 1becd403..91c12aa9 100755 --- a/ca/irbe_cli +++ b/ca/irbe_cli @@ -322,6 +322,8 @@ while argv: argv = q_pdu.client_getopt(argv[1:]) q_msg.append(q_pdu) +import django + from django.conf import settings settings.configure( @@ -334,8 +336,13 @@ settings.configure( "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 server_ca = rpki.irdb.ServerCA.objects.get() diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py index 1b339a89..f1073c92 100644 --- a/ca/tests/yamlconf.py +++ b/ca/tests/yamlconf.py @@ -773,13 +773,20 @@ def body(): databases["default"] = databases[db.root.irdb_name] + import django + from django.conf import settings settings.configure( DATABASES = databases, DATABASE_ROUTERS = ["rpki.irdb.router.DBContextRouter"], + MIDDLEWARE_CLASSES = (), INSTALLED_APPS = ("rpki.irdb",)) + if django.VERSION >= (1, 7): # API change, feh + from django.apps import apps + apps.populate(settings.INSTALLED_APPS) + import rpki.irdb rpki.irdb.models.ca_certificate_lifetime = rpki.sundial.timedelta(days = 3652 * 2) |