diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index a5ba5c3..8f0ca08 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -36,7 +36,7 @@ class Dovecot(base.Installer): # Check if modoboa version > 2.2 modoboa_version = python.get_package_version( "modoboa", - self.venv_path, + self.config.get("modoboa", "venv_path"), sudo_user=self.user ) self.modoboa_2_2_or_greater = False diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 2414eb5..2b36c8c 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -45,20 +45,6 @@ class Modoboa(base.Installer): def __init__(self, *args, **kwargs): """Get configuration.""" 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.instance_path = self.config.get("modoboa", "instance_path") 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.opendkim_enabled = self.config.getboolean("opendkim", "enabled") 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: self.dkim_cron_enabled = True