From ece218bbbeff54df21ed51fca393d40aa7a06999 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 24 Apr 2017 18:01:45 +0200
Subject: [PATCH] Enable all services.

see #119
---
 modoboa_installer/database.py        |  5 +++--
 modoboa_installer/scripts/dovecot.py |  4 +++-
 modoboa_installer/scripts/uwsgi.py   | 12 ++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py
index 1276a12..86c4296 100644
--- a/modoboa_installer/database.py
+++ b/modoboa_installer/database.py
@@ -5,6 +5,7 @@ import pwd
 import stat
 
 from . import package
+from . import system
 from . import utils
 
 
@@ -28,7 +29,7 @@ class Database(object):
     def install_package(self):
         """Install database package if required."""
         package.backend.install_many(self.packages[package.backend.FORMAT])
-        utils.exec_cmd("service {} start".format(self.service))
+        system.enable_and_start_service(self.service)
 
 
 class PostgreSQL(Database):
@@ -53,7 +54,7 @@ class PostgreSQL(Database):
             pattern = "s/^host(.+)ident$/host$1md5/"
             cfgfile = "/var/lib/pgsql/data/pg_hba.conf"
             utils.exec_cmd("perl -pi -e '{}' {}".format(pattern, cfgfile))
-        utils.exec_cmd("service {} start".format(self.service))
+        system.enable_and_start_service(self.service)
 
     def _exec_query(self, query, dbname=None, dbuser=None, dbpassword=None):
         """Exec a postgresql query."""
diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py
index 8d48f5b..1e1f086 100644
--- a/modoboa_installer/scripts/dovecot.py
+++ b/modoboa_installer/scripts/dovecot.py
@@ -5,6 +5,7 @@ import pwd
 
 from .. import database
 from .. import package
+from .. import system
 from .. import utils
 
 from . import base
@@ -102,5 +103,6 @@ class Dovecot(base.Installer):
         code, output = utils.exec_cmd("service dovecot status")
         action = "start" if code else "restart"
         utils.exec_cmd(
-            "service dovecot {} > /dev/null 2>&1".format(action),
+            "service {} {} > /dev/null 2>&1".format(self.appname, action),
             capture_output=False)
+        system.enable_service(self.get_daemon_name())
diff --git a/modoboa_installer/scripts/uwsgi.py b/modoboa_installer/scripts/uwsgi.py
index 4885d62..11f8919 100644
--- a/modoboa_installer/scripts/uwsgi.py
+++ b/modoboa_installer/scripts/uwsgi.py
@@ -97,11 +97,7 @@ class Uwsgi(base.Installer):
 
     def restart_daemon(self):
         """Restart daemon process."""
-        instances = ["modoboa_instance"]
-        if self.config.getboolean("automx", "enabled"):
-            instances.append("automx_instance")
-        for instance in instances:
-            code, output = utils.exec_cmd("service uwsgi status {}".format(
-                instance))
-            action = "start" if code else "restart"
-            utils.exec_cmd("service uwsgi {}".format(action))
+        code, output = utils.exec_cmd("service uwsgi status")
+        action = "start" if code else "restart"
+        utils.exec_cmd("service uwsgi {}".format(action))
+        system.enable_service(self.get_daemon_name())