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

Cleaning code the 2nd

Browse Source
This commit is contained in:
Spitap
2023-08-29 20:42:44 +02:00
parent 35fa19e47d
commit ef1bace29e
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modoboa_installer/scripts/dovecot.py
View File

@@ -7,6 +7,7 @@ import shutil
from .. import database from .. import database
from .. import package from .. import package
from .. import python
from .. import system from .. import system
from .. import utils from .. import utils
@@ -33,6 +34,11 @@ class Dovecot(base.Installer):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super.__init__(*args, **kwargs) super.__init__(*args, **kwargs)
# Check if modoboa version > 2.2 # 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 self.modoboa_2_2_or_greater = False
condition = ( condition = (
(modoboa_version[0] == 2 and modoboa_version[1] >= 2) or (modoboa_version[0] == 2 and modoboa_version[1] >= 2) or

5
modoboa_installer/scripts/modoboa.py
View File

@@ -46,6 +46,11 @@ class Modoboa(base.Installer):
"""Get configuration.""" """Get configuration."""
super(Modoboa, self).__init__(*args, **kwargs) super(Modoboa, self).__init__(*args, **kwargs)
# Check if modoboa version > 2.2 # 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 self.modoboa_2_2_or_greater = False
condition = ( condition = (
(modoboa_version[0] == 2 and modoboa_version[1] >= 2) or (modoboa_version[0] == 2 and modoboa_version[1] >= 2) or