From 466d65f861316bba6b931942aca627a6fbfdb157 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 13 Dec 2016 15:13:33 +0100
Subject: [PATCH] Removed 'all' shortcut.

fix #79
---
 installer.cfg                        | 4 +++-
 modoboa_installer/database.py        | 5 +++--
 modoboa_installer/scripts/modoboa.py | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/installer.cfg b/installer.cfg
index d4e1233..34fccf5 100644
--- a/installer.cfg
+++ b/installer.cfg
@@ -32,8 +32,10 @@ timezone = Europe/Paris
 dbname = modoboa
 dbuser = modoboa
 dbpassword = password
-# Extensions to install (to install all of them, use: all)
+# Extensions to install
+# also available: modoboa-radicale modoboa-dmarc modoboa-imap-migration
 extensions = modoboa-amavis modoboa-pdfcredentials modoboa-postfix-autoreply modoboa-sievefilters modoboa-stats modoboa-webmail
+
 # Deploy Modoboa and enable development mode
 devmode = false
 
diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py
index 6b592dc..45643b6 100644
--- a/modoboa_installer/database.py
+++ b/modoboa_installer/database.py
@@ -123,7 +123,7 @@ class MySQL(Database):
 
     packages = {
         "deb": ["mysql-server", "libmysqlclient-dev"],
-        "rpm": ["mariadb", "mariadb-devel","mariadb-server"],
+        "rpm": ["mariadb", "mariadb-devel", "mariadb-server"],
     }
     service = "mariadb" if package.backend.FORMAT == "rpm" else "mysql"
 
@@ -135,7 +135,8 @@ class MySQL(Database):
             "mysql-server", "root_password_again", "password", self.dbpassword)
         super(MySQL, self).install_package()
         if package.backend.FORMAT == "rpm":
-        	utils.exec_cmd("mysqladmin -u root password '{}'".format(self.dbpassword))
+            utils.exec_cmd("mysqladmin -u root password '{}'".format(
+                self.dbpassword))
 
     def _exec_query(self, query, dbname=None, dbuser=None, dbpassword=None):
         """Exec a mysql query."""
diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py
index fec9217..50f7ab8 100644
--- a/modoboa_installer/scripts/modoboa.py
+++ b/modoboa_installer/scripts/modoboa.py
@@ -13,7 +13,6 @@ from . import install
 
 
 class Modoboa(base.Installer):
-
     """Modoboa installation."""
 
     appname = "modoboa"