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

Removed 'all' shortcut.

Browse Source 
fix #79
This commit is contained in:
Antoine Nguyen
2016-12-13 15:13:33 +01:00
parent d18376fc70
commit 466d65f861
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer.cfg
View File

@@ -32,8 +32,10 @@ timezone = Europe/Paris
dbname = modoboa dbname = modoboa
dbuser = modoboa dbuser = modoboa
dbpassword = password 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 extensions = modoboa-amavis modoboa-pdfcredentials modoboa-postfix-autoreply modoboa-sievefilters modoboa-stats modoboa-webmail
# Deploy Modoboa and enable development mode # Deploy Modoboa and enable development mode
devmode = false devmode = false

5
modoboa_installer/database.py
View File

@@ -123,7 +123,7 @@ class MySQL(Database):
packages = { packages = {
"deb": ["mysql-server", "libmysqlclient-dev"], "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" service = "mariadb" if package.backend.FORMAT == "rpm" else "mysql"
@@ -135,7 +135,8 @@ class MySQL(Database):
"mysql-server", "root_password_again", "password", self.dbpassword) "mysql-server", "root_password_again", "password", self.dbpassword)
super(MySQL, self).install_package() super(MySQL, self).install_package()
if package.backend.FORMAT == "rpm": 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): def _exec_query(self, query, dbname=None, dbuser=None, dbpassword=None):
"""Exec a mysql query.""" """Exec a mysql query."""

1
modoboa_installer/scripts/modoboa.py
View File

@@ -13,7 +13,6 @@ from . import install
class Modoboa(base.Installer): class Modoboa(base.Installer):
"""Modoboa installation.""" """Modoboa installation."""
appname = "modoboa" appname = "modoboa"