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

Fixed venvpath

Browse Source
This commit is contained in:
Spitap
2023-08-30 09:05:42 +02:00
parent 941142f5f5
commit b1da76cfbd
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modoboa_installer/scripts/dovecot.py
View File

@@ -36,7 +36,7 @@ class Dovecot(base.Installer):
# Check if modoboa version > 2.2 # Check if modoboa version > 2.2
modoboa_version = python.get_package_version( modoboa_version = python.get_package_version(
"modoboa", "modoboa",
self.venv_path, self.config.get("modoboa", "venv_path"),
sudo_user=self.user sudo_user=self.user
) )
self.modoboa_2_2_or_greater = False self.modoboa_2_2_or_greater = False

28
modoboa_installer/scripts/modoboa.py
View File

@@ -45,20 +45,6 @@ class Modoboa(base.Installer):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Get configuration.""" """Get configuration."""
super(Modoboa, self).__init__(*args, **kwargs) super(Modoboa, self).__init__(*args, **kwargs)
# Check if modoboa version > 2.2
modoboa_version = python.get_package_version(
"modoboa",
self.venv_path,
sudo_user=self.user
)
self.modoboa_2_2_or_greater = False
condition = (
(modoboa_version[0] == 2 and modoboa_version[1] >= 2) or
modoboa_version[0] > 2
)
if condition:
self.modoboa_2_2_or_greater = True
self.venv_path = self.config.get("modoboa", "venv_path") self.venv_path = self.config.get("modoboa", "venv_path")
self.instance_path = self.config.get("modoboa", "instance_path") self.instance_path = self.config.get("modoboa", "instance_path")
self.extensions = self.config.get("modoboa", "extensions").split() self.extensions = self.config.get("modoboa", "extensions").split()
@@ -76,6 +62,20 @@ class Modoboa(base.Installer):
self.dovecot_enabled = self.config.getboolean("dovecot", "enabled") self.dovecot_enabled = self.config.getboolean("dovecot", "enabled")
self.opendkim_enabled = self.config.getboolean("opendkim", "enabled") self.opendkim_enabled = self.config.getboolean("opendkim", "enabled")
self.dkim_cron_enabled = False self.dkim_cron_enabled = False
# Check if modoboa version > 2.2
modoboa_version = python.get_package_version(
"modoboa",
self.venv_path,
sudo_user=self.user
)
self.modoboa_2_2_or_greater = False
condition = (
(modoboa_version[0] == 2 and modoboa_version[1] >= 2) or
modoboa_version[0] > 2
)
if condition:
self.modoboa_2_2_or_greater = True
if not self.modoboa_2_2_or_greater and self.opendkim_enabled: if not self.modoboa_2_2_or_greater and self.opendkim_enabled:
self.dkim_cron_enabled = True self.dkim_cron_enabled = True