diff --git a/modoboa_installer/scripts/automx.py b/modoboa_installer/scripts/automx.py index 21754de..e278645 100644 --- a/modoboa_installer/scripts/automx.py +++ b/modoboa_installer/scripts/automx.py @@ -6,6 +6,7 @@ import shutil import stat from .. import python +from .. import system from .. import utils from . import base @@ -19,7 +20,7 @@ class Automx(base.Installer): no_daemon = True packages = { "deb": ["memcached", "unzip"], - "rpm": [] + "rpm": ["memcached", "unzip"] } with_user = True @@ -90,3 +91,4 @@ class Automx(base.Installer): """Additional tasks.""" self._setup_venv() self._deploy_instance() + system.enable_and_start_service("memcached") diff --git a/modoboa_installer/scripts/base.py b/modoboa_installer/scripts/base.py index 6ec63b6..7fdb89a 100644 --- a/modoboa_installer/scripts/base.py +++ b/modoboa_installer/scripts/base.py @@ -136,10 +136,7 @@ class Installer(object): if self.no_daemon: return name = self.get_daemon_name() - system.enable_service(name) - code, output = utils.exec_cmd("service {} status".format(name)) - action = "start" if code else "restart" - utils.exec_cmd("service {} {}".format(name, action)) + system.enable_and_start_service(name) def run(self): """Run the installer.""" diff --git a/modoboa_installer/system.py b/modoboa_installer/system.py index 968d7a3..be6a970 100644 --- a/modoboa_installer/system.py +++ b/modoboa_installer/system.py @@ -49,3 +49,11 @@ def add_user_to_group(user, group): def enable_service(name): """Enable a service at startup.""" utils.exec_cmd("systemctl enable {}".format(name)) + + +def enable_and_start_service(name): + """Enable a start a service.""" + enable_service(name) + code, output = utils.exec_cmd("service {} status".format(name)) + action = "start" if code else "restart" + utils.exec_cmd("service {} {}".format(name, action))