summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Pugh2017-07-07 15:51:22 (GMT)
committerJon Pugh2017-07-07 15:51:22 (GMT)
commit60ca1cfcd6706031a6cba3c752e6d1b016bad67b (patch)
treea365cb41861730137ced54f48c6fb19c5fcf436d
parentab2f03e10701e3ac73ca40bd9757514a78a43b99 (diff)
Issue #2794915: Add 'db_grant_all_hosts' option to hostmaster-install command, so we can use it when automating aegir installation.2794915-grant-all-hosts
-rw-r--r--install.hostmaster.inc2
-rw-r--r--provision.drush.inc1
2 files changed, 3 insertions, 0 deletions
diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index 89b7e79..0ecd395 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -174,6 +174,7 @@ function drush_provision_hostmaster_install($site = NULL) {
$aegir_db_pass = drush_get_option('aegir_db_pass');
$aegir_db_port = drush_get_option('aegir_db_port');
$aegir_db_host = drush_get_option('aegir_db_host');
+ $aegir_db_grant_all_hosts = drush_get_option('aegir_db_grant_all_hosts');
$server = '@server_master';
$master_context = array(
@@ -202,6 +203,7 @@ function drush_provision_hostmaster_install($site = NULL) {
'context_type' => 'server',
'db_service_type' => 'mysql',
'master_db' => $master_db,
+ 'db_grant_all_hosts' => $aegir_db_grant_all_hosts,
'db_port' => $aegir_db_port,
);
drush_invoke_process('@none', "provision-save", array($dbserver), $dbserver_context);
diff --git a/provision.drush.inc b/provision.drush.inc
index f417a8e..a2e2700 100644
--- a/provision.drush.inc
+++ b/provision.drush.inc
@@ -319,6 +319,7 @@ function provision_drush_command() {
'aegir_db_user' => dt('Database user to connect as (default: %user)', array('%user' => 'root')),
'aegir_db_pass' => dt('Database password to use'),
'aegir_db_port' => dt('Database port to use (default: %port)', array('%port' => '3306')),
+ 'aegir_db_grant_all_hosts' => dt('Allow connection from arbitrary web hosts. (Default: false)'),
'client_email' => dt('Email of the first client to create in the frontend'),
'client_name' => dt('Name of the first client to create in the frontend (default: %user)', array('%user' => 'admin')),
'makefile' => dt('The makefile used to create the hostmaster platform (default: %makefile)', array('%makefile' => dirname(__FILE__). '/aegir.make')),