From 7f58e71a2a82ee4a0c1487aae2ccc92dd57436a2 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Tue, 30 Jan 2018 18:27:03 +0000 Subject: [PATCH 1/2] postgresql_psycopg2 is now an alias for postgresql --- modoboa/core/commands/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 3dcfc0ccb..25c81c2e1 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -135,7 +135,7 @@ class DeployCommand(Command): info["NAME"] = "%s.db" % name return info if info["ENGINE"] == "postgres": - info["ENGINE"] = "django.db.backends.postgresql_psycopg2" + info["ENGINE"] = "django.db.backends.postgresql" default_port = 5432 else: info["ENGINE"] = "django.db.backends.mysql" From 98d34c2366642ddc660b6409163dcc8291d2c549 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Sat, 14 Apr 2018 14:06:37 +0100 Subject: [PATCH 2/2] fix comparison for db engine --- modoboa/core/management/commands/generate_postfix_maps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/core/management/commands/generate_postfix_maps.py b/modoboa/core/management/commands/generate_postfix_maps.py index dd4036481..474a2f6a8 100644 --- a/modoboa/core/management/commands/generate_postfix_maps.py +++ b/modoboa/core/management/commands/generate_postfix_maps.py @@ -99,7 +99,7 @@ query = {{ query|safe }} if dburl else settings.DATABASES["default"]) if "sqlite" in db_settings["ENGINE"]: dbtype = "sqlite" - elif "psycopg2" in db_settings["ENGINE"]: + elif "postgresql" in db_settings["ENGINE"]: dbtype = "postgres" else: dbtype = "mysql"