evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated database connectors.

Browse Source 
fix #185
This commit is contained in:
Antoine Nguyen
2018-03-09 15:31:58 +01:00
parent 18022f6941
commit 6ea1114cd8
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modoboa_installer/scripts/automx.py
View File

@@ -59,9 +59,9 @@ class Automx(base.Installer):
"python-dateutil", "configparser" "python-dateutil", "configparser"
] ]
if self.dbengine == "postgres": if self.dbengine == "postgres":
packages.append("psycopg2") packages.append("psycopg2-binary")
else: else:
packages.append("MYSQL-Python") packages.append("mysqlclient")
python.install_packages(packages, self.venv_path, sudo_user=self.user) python.install_packages(packages, self.venv_path, sudo_user=self.user)
target = "{}/master.zip".format(self.home_dir) target = "{}/master.zip".format(self.home_dir)
if os.path.exists(target): if os.path.exists(target):

12
modoboa_installer/scripts/modoboa.py
View File

@@ -82,9 +82,9 @@ class Modoboa(base.Installer):
else: else:
packages.append(extension) packages.append(extension)
if self.dbengine == "postgres": if self.dbengine == "postgres":
packages.append("psycopg2") packages.append("psycopg2-binary")
else: else:
packages.append("MYSQL-Python") packages.append("mysqlclient")
if sys.version_info.major == 2 and sys.version_info.micro < 9: if sys.version_info.major == 2 and sys.version_info.micro < 9:
# Add extra packages to fix the SNI issue # Add extra packages to fix the SNI issue
packages += ["pyOpenSSL"] packages += ["pyOpenSSL"]
@@ -192,14 +192,6 @@ class Modoboa(base.Installer):
"handle_mailboxes": True, "handle_mailboxes": True,
"account_auto_removal": True "account_auto_removal": True
}, },
# FIXME: since we rewrite all parameters, the secret key
# previously created will disappear. As a quick fix, we
# recreate a new one here but it will mess up opened
# sessions if the installer is used to upgrade an existing
# database...
"core": {
"secret_key": utils.random_key()
},
"modoboa_amavis": { "modoboa_amavis": {
"am_pdp_mode": "inet", "am_pdp_mode": "inet",
}, },