aboutsummaryrefslogtreecommitdiff
path: root/rpki/django_settings
diff options
context:
space:
mode:
Diffstat (limited to 'rpki/django_settings')
-rw-r--r--rpki/django_settings/common.py7
-rw-r--r--rpki/django_settings/irdb.py4
-rw-r--r--rpki/django_settings/pubd.py4
-rw-r--r--rpki/django_settings/rpkid.py4
4 files changed, 9 insertions, 10 deletions
diff --git a/rpki/django_settings/common.py b/rpki/django_settings/common.py
index 330ab165..a1d54c71 100644
--- a/rpki/django_settings/common.py
+++ b/rpki/django_settings/common.py
@@ -56,11 +56,10 @@ if os.getenv("RPKI_DJANGO_DEBUG") == "yes":
# fragile, tedious to use, and generally more complex than we need,
# because any given program is only going to be using one database.
-# Figure out which apps we're running. Modules that import this add
-# others. "south" will go away when we upgrade to Django 1.7+, at
-# which point we may leave this entirely for the importing modules.
-INSTALLED_APPS = ["south"]
+# Apps are also handled by the modules that import this one, now that
+# we don't require South.
+
# That would be it if we just need the ORM, but Django throws a hissy
# fit if SECRET_KEY isn't set, whether we use it for anything or not.
diff --git a/rpki/django_settings/irdb.py b/rpki/django_settings/irdb.py
index 8a33e674..7749b9d6 100644
--- a/rpki/django_settings/irdb.py
+++ b/rpki/django_settings/irdb.py
@@ -34,9 +34,9 @@ DATABASES = dict(
USER = cfg.get("sql-username", section = "irdbd"),
PASSWORD = cfg.get("sql-password", section = "irdbd")))
-# Apps. See comment in .common re the "south" app.
+# Apps.
-INSTALLED_APPS.append("rpki.irdb")
+INSTALLED_APPS = ["rpki.irdb"]
# Allow local site to override any setting above -- but if there's
diff --git a/rpki/django_settings/pubd.py b/rpki/django_settings/pubd.py
index 80618652..6f1fe06b 100644
--- a/rpki/django_settings/pubd.py
+++ b/rpki/django_settings/pubd.py
@@ -33,9 +33,9 @@ DATABASES = dict(
PASSWORD = cfg.get("sql-password", section = "pubd")))
-# Apps -- see comment in .common re "south" app.
+# Apps.
-INSTALLED_APPS.append("rpki.pubdb")
+INSTALLED_APPS = ["rpki.pubdb"]
# Allow local site to override any setting above -- but if there's
diff --git a/rpki/django_settings/rpkid.py b/rpki/django_settings/rpkid.py
index 64938647..e3abb0eb 100644
--- a/rpki/django_settings/rpkid.py
+++ b/rpki/django_settings/rpkid.py
@@ -33,9 +33,9 @@ DATABASES = dict(
PASSWORD = cfg.get("sql-password", section = "rpkid")))
-# Apps -- see .common re "south" app.
+# Apps.
-INSTALLED_APPS.append("rpki.rpkidb")
+INSTALLED_APPS = ["rpki.rpkidb"]
# Allow local site to override any setting above -- but if there's