summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rossouw2010-06-18 00:29:37 (GMT)
committerAdrian Rossouw2010-06-18 00:29:37 (GMT)
commit0134577a48704a3ae9716dd0b4d97fdc2fddba4e (patch)
treee9a7328ded152db626cca162a71e751fe51d091c
parentd613313d31c81247cccba5b12e54b5383bbc676d (diff)
Hostmaster install and migrate now makes use of the makefile flag to fetch the profile, so hostmaster-make cmd goes away.
-rw-r--r--install.hostmaster.inc3
-rw-r--r--migrate.hostmaster.inc14
-rw-r--r--provision.drush.inc12
3 files changed, 3 insertions, 26 deletions
diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index 9646ef7..dcc50b1 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -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');
diff --git a/migrate.hostmaster.inc b/migrate.hostmaster.inc
index cdbbf7e..515aec3 100644
--- a/migrate.hostmaster.inc
+++ b/migrate.hostmaster.inc
@@ -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);
diff --git a/provision.drush.inc b/provision.drush.inc
index 7f47be8..034b339 100644
--- a/provision.drush.inc
+++ b/provision.drush.inc
@@ -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