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

Fixed python3 compat.

Browse Source
This commit is contained in:
Antoine Nguyen
2017-10-08 14:44:26 +02:00
parent d94957b79f
commit 93f5fefe6f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.rst
View File

@@ -1,6 +1,8 @@
modoboa-installer modoboa-installer
================= =================
|travis|
An installer which deploy a complete mail server based on Modoboa. An installer which deploy a complete mail server based on Modoboa.
.. warning:: .. warning::
@@ -81,3 +83,6 @@ modify the following settings::
Change the ``email`` setting to a valid value since it will be used Change the ``email`` setting to a valid value since it will be used
for account recovery. for account recovery.
.. |travis| image:: https://travis-ci.org/modoboa/modoboa-installer.png?branch=master
:target: https://travis-ci.org/modoboa/modoboa-installer

6
run.py
View File

@@ -19,6 +19,9 @@ from modoboa_installer import utils
def main(input_args): def main(input_args):
"""Install process.""" """Install process."""
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
versions = (
["latest"] + list(compatibility_matrix.COMPATIBILITY_MATRIX.keys())
)
parser.add_argument("--debug", action="store_true", default=False, parser.add_argument("--debug", action="store_true", default=False,
help="Enable debug output") help="Enable debug output")
parser.add_argument("--force", action="store_true", default=False, parser.add_argument("--force", action="store_true", default=False,
@@ -26,8 +29,7 @@ def main(input_args):
parser.add_argument("--configfile", default="installer.cfg", parser.add_argument("--configfile", default="installer.cfg",
help="Configuration file to use") help="Configuration file to use")
parser.add_argument( parser.add_argument(
"--version", default="latest", "--version", default="latest", choices=versions,
choices=["latest"] + compatibility_matrix.COMPATIBILITY_MATRIX.keys(),
help="Modoboa version to install") help="Modoboa version to install")
parser.add_argument( parser.add_argument(
"--stop-after-configfile-check", action="store_true", default=False, "--stop-after-configfile-check", action="store_true", default=False,