Commit 95845b5f authored by Steven Jones's avatar Steven Jones

Issue #983056 by Steven Jones: Fixed installer does not properly escape the mysql root password.

parent 69e82db4
...@@ -108,6 +108,9 @@ The following settings will be used: ...@@ -108,6 +108,9 @@ The following settings will be used:
return TRUE; return TRUE;
} }
/**
* Drush command to install hostmaster.
*/
function drush_provision_hostmaster_install($site = NULL) { function drush_provision_hostmaster_install($site = NULL) {
$version = drush_get_option('version'); $version = drush_get_option('version');
$site = drush_get_option('site', provision_fqdn()); $site = drush_get_option('site', provision_fqdn());
...@@ -130,7 +133,7 @@ function drush_provision_hostmaster_install($site = NULL) { ...@@ -130,7 +133,7 @@ function drush_provision_hostmaster_install($site = NULL) {
'master_url' => "http://" . $site, 'master_url' => "http://" . $site,
); );
$master_db = sprintf("mysql://%s:%s@%s",$aegir_db_user, $aegir_db_pass, drush_get_option('aegir_db_host')); $master_db = sprintf("mysql://%s:%s@%s", urlencode($aegir_db_user), urlencode($aegir_db_pass), drush_get_option('aegir_db_host'));
if (drush_get_option('aegir_host') == drush_get_option('aegir_db_host')) { if (drush_get_option('aegir_host') == drush_get_option('aegir_db_host')) {
$master_context['db_service_type'] = 'mysql'; $master_context['db_service_type'] = 'mysql';
$master_context['master_db'] = $master_db; $master_context['master_db'] = $master_db;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment