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

Merge branch 'master' of github.com:modoboa/modoboa-installer

Browse Source
This commit is contained in:
Antoine Nguyen
2016-09-16 17:08:55 +02:00
parent 7be198a066 c8b0a32b3b
commit 672bb592a0
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modoboa_installer/database.py
View File

@@ -123,9 +123,9 @@ class MySQL(Database):
packages = { packages = {
"deb": ["mysql-server", "libmysqlclient-dev"], "deb": ["mysql-server", "libmysqlclient-dev"],
"rpm": ["mariadb", "mariadb-devel"], "rpm": ["mariadb", "mariadb-devel","mariadb-server"],
} }
service = "mysql" service = "mariadb" if package.backend.FORMAT == "rpm" else "mysql"
def install_package(self): def install_package(self):
"""Preseed package installation.""" """Preseed package installation."""
@@ -134,9 +134,11 @@ class MySQL(Database):
package.backend.preconfigure( package.backend.preconfigure(
"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":
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 postgresql query.""" """Exec a mysql query."""
if dbuser is None and dbpassword is None: if dbuser is None and dbpassword is None:
dbuser = self.dbuser dbuser = self.dbuser
dbpassword = self.dbpassword dbpassword = self.dbpassword
@@ -150,6 +152,9 @@ class MySQL(Database):
self._exec_query( self._exec_query(
"CREATE USER '{}'@'%' IDENTIFIED BY '{}'".format( "CREATE USER '{}'@'%' IDENTIFIED BY '{}'".format(
name, password)) name, password))
self._exec_query(
"CREATE USER '{}'@'localhost' IDENTIFIED BY '{}'".format(
name, password))
def create_database(self, name, owner): def create_database(self, name, owner):
"""Create a database.""" """Create a database."""
@@ -162,6 +167,9 @@ class MySQL(Database):
self._exec_query( self._exec_query(
"GRANT ALL PRIVILEGES ON {}.* to '{}'@'%'" "GRANT ALL PRIVILEGES ON {}.* to '{}'@'%'"
.format(dbname, user)) .format(dbname, user))
self._exec_query(
"GRANT ALL PRIVILEGES ON {}.* to '{}'@'localhost'"
.format(dbname, user))
def load_sql_file(self, dbname, dbuser, dbpassword, path): def load_sql_file(self, dbname, dbuser, dbpassword, path):
"""Load SQL file.""" """Load SQL file."""

3
modoboa_installer/ssl.py
View File

@@ -11,6 +11,7 @@ class CertificateBackend(object):
def __init__(self, config): def __init__(self, config):
"""Set path to certificates.""" """Set path to certificates."""
self.config = config self.config = config
if not config.has_option("general", "tls_key_file"):
for base_dir in ["/etc/pki/tls", "/etc/ssl"]: for base_dir in ["/etc/pki/tls", "/etc/ssl"]:
if os.path.exists(base_dir): if os.path.exists(base_dir):
self.config.set( self.config.set(
@@ -21,6 +22,8 @@ class CertificateBackend(object):
"{}/certs/%(hostname)s.cert".format(base_dir)) "{}/certs/%(hostname)s.cert".format(base_dir))
return return
raise RuntimeError("Cannot find a directory to store certificate") raise RuntimeError("Cannot find a directory to store certificate")
else:
return
class SelfSignedCertificate(CertificateBackend): class SelfSignedCertificate(CertificateBackend):