More Django settings cleanup.

svn path=/branches/tk705/; revision=6099

1 files changed, 1 insertions, 21 deletions

diff --git a/ca/irbe_cli b/ca/irbe_cli
index d425095b..2edde024 100755
--- a/ca/irbe_cli
+++ b/ca/irbe_cli
@@ -321,27 +321,7 @@ while argv:
   argv = q_pdu.client_getopt(argv[1:])
   q_msg.append(q_pdu)
 
-if True:
-  os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings")
-
-else:
-  import django
-  from django.conf import settings
-  settings.configure(
-    DATABASES = { "default" : {
-      "ENGINE"   : "django.db.backends.mysql",
-      "NAME"     : cfg.get("sql-database", section = "irdbd"),
-      "USER"     : cfg.get("sql-username", section = "irdbd"),
-      "PASSWORD" : cfg.get("sql-password", section = "irdbd"),
-      "HOST"     : "",
-      "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)
+os.environ.update(DJANGO_SETTINGS_MODULE = "rpki.django_settings.irdb")
 
 import rpki.irdb