Commit 0134577a authored by Adrian Rossouw's avatar Adrian Rossouw

Hostmaster install and migrate now makes use of the makefile flag to fetch the...

Hostmaster install and migrate now makes use of the makefile flag to fetch the profile, so hostmaster-make cmd goes away.
parent d613313d
......@@ -19,8 +19,6 @@ function drush_provision_hostmaster_install($site = NULL) {
drush_backend_invoke('dl', array('drush_make-' . drush_get_option('drush_make_version', '6.x-2.0-beta6'), 'destination' => $aegir_root . '/.drush/'));
}
drush_print(dt("deploying hostmaster application"));
drush_backend_invoke('hostmaster-make', array($platform));
}
$data['master_db'] = drush_get_option('master_db');
......@@ -65,6 +63,7 @@ function drush_provision_hostmaster_install($site = NULL) {
'server' => $server,
'web_server' => $server,
'root' => $platform,
'makefile' => $aegir_root . '/.drush/provision/aegir.make',
));
provision_backend_invoke($platform_name, 'provision-verify');
......
......@@ -3,18 +3,7 @@
/**
* @file manual site migrate system
*/
function drush_provision_hostmaster_migrate_validate($site, $platform) {
// verify the target platform:
if (!is_dir($platform)) {
drush_print("The platform path you specified does not exist yet.");
drush_print("Downloading the hostmaster front end. (this might take a few minutes)");
drush_backend_invoke('make', array(dirname(__FILE__) . '/aegir.make', $platform));
if (drush_get_error()) {
drush_log("The hostmaster front end could not be downloaded, exiting.", "error");
}
}
$data = drush_get_merged_options();
// add a server record :
$server = '@server_master';
......@@ -30,8 +19,8 @@ function drush_provision_hostmaster_migrate_validate($site, $platform) {
// mysql
'db_service_type' => 'mysql',
'master_db' => $data['master_db'],
));
provision_backend_invoke($server, 'provision-verify');
drush_set_option('server_name', $server);
......@@ -51,6 +40,7 @@ function drush_provision_hostmaster_migrate_validate($site, $platform) {
'server' => $server,
'web_server' => $server,
'root' => $platform,
'makefile' => dirname(__FILE__) . '/aegir.make',
));
provision_backend_invoke($new_platform, 'provision-verify');
drush_set_option('new_platform', $new_platform);
......
......@@ -176,14 +176,6 @@ function provision_drush_command() {
),
);
$items['hostmaster-make'] = array(
'description' => dt('Build a platform containing the Hostmaster user interface for provision.'),
'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
'arguments' => array(
'/path/to/platform' => dt('The path to create the platform in.')
),
);
$items['hostmaster-install'] = array(
'description' => dt('Install and verify the Hostmaster frontend.'),
'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
......@@ -216,10 +208,6 @@ function provision_drush_command() {
return $items;
}
function drush_provision_hostmaster_make($platform) {
drush_backend_invoke('make', array(dirname(__FILE__) . '/aegir.make', $platform));
}
function drush_provision_save($alias = null) {
if (drush_get_option('delete', false)) {
// remove an existing alias
......
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