From ad447c2715ee97da4c110de5da72a8e0ca9a0247 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 16 Nov 2018 16:54:07 +0100 Subject: [PATCH] - store port in mysql_clientdb file - use clientdb config for addon sql files --- install/lib/installer_base.lib.php | 1 + install/tpl/mysql_clientdb.conf.master | 1 + server/lib/classes/ispconfig_addon_installer_base.inc.php | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 38632d01d1..70e5bbf10b 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2578,6 +2578,7 @@ class installer_base { $content = str_replace('{hostname}', $conf['mysql']['host'], $content); $content = str_replace('{username}', $conf['mysql']['admin_user'], $content); $content = str_replace('{password}', addslashes($conf['mysql']['admin_password']), $content); + $content = str_replace('{port}', addslashes($conf['mysql']['port']), $content); wf($install_dir.'/server/lib/mysql_clientdb.conf', $content); chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600); chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); diff --git a/install/tpl/mysql_clientdb.conf.master b/install/tpl/mysql_clientdb.conf.master index e6eba12615..c205d71428 100644 --- a/install/tpl/mysql_clientdb.conf.master +++ b/install/tpl/mysql_clientdb.conf.master @@ -3,5 +3,6 @@ $clientdb_host = '{hostname}'; $clientdb_user = '{username}'; $clientdb_password = '{password}'; +$clientdb_port = '{port}'; ?> \ No newline at end of file diff --git a/server/lib/classes/ispconfig_addon_installer_base.inc.php b/server/lib/classes/ispconfig_addon_installer_base.inc.php index 25aaece872..d5b02c65d3 100644 --- a/server/lib/classes/ispconfig_addon_installer_base.inc.php +++ b/server/lib/classes/ispconfig_addon_installer_base.inc.php @@ -119,12 +119,14 @@ class ispconfig_addon_installer_base { } } + include '/usr/local/ispconfig/server/lib/mysql_clientdb.conf'; + $app->log('Adding addon entry to db.', 0, false); // create addon entry if not existing $qry = 'INSERT IGNORE INTO `addons` (`addon_ident`, `addon_version`, `addon_name`, `db_version`) VALUES (?, ?, ?, ?)'; $app->db->query($qry, $this->addon_ident, $this->addon_version, $this->addon_name, 0); - $mysql_command = 'mysql --default-character-set=' . escapeshellarg($conf['db_charset']) . ' --force -h ' . escapeshellarg($conf['db_host']) . ' -u ' . escapeshellarg($conf['db_user']) . ' -p' . escapeshellarg($conf['db_password']) . ' -P ' . escapeshellarg($conf['db_port']) . ' -D ' . escapeshellarg($conf['db_database']); + $mysql_command = 'mysql --default-character-set=' . escapeshellarg($conf['db_charset']) . ' --force -h ' . escapeshellarg($clientdb_host) . ' -u ' . escapeshellarg($clientdb_user) . ' -p' . escapeshellarg($clientdb_password) . ' -P ' . escapeshellarg($clientdb_port) . ' -D ' . escapeshellarg($conf['db_database']); if($incremental === false) { $sql_file = $this->temp_dir . '/install/sql/' . $this->addon_ident . '.sql'; -- GitLab