summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2010-10-29 09:31:52 -0400
committeranarcat2010-10-29 09:31:52 -0400
commitefeceb9bba32e5aa4957a3e2d4a933aceaa3fe43 (patch)
treed38ed89e1e30fb3330747e41200662e49de53047
parentc21e02dfccb8b61c8fb48024dec6d2d8cb635e96 (diff)
add custom makefile parameterdev-simplerinstaller
-rw-r--r--install.hostmaster.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index d1a7b11..427bd37 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -16,6 +16,7 @@ function drush_provision_hostmaster_install_validate($site = NULL) {
drush_set_default('http_service_type', 'apache');
drush_set_default('drush_make_version', '6.x-2.0-beta9');
$aegir_db_user = drush_set_default('aegir_db_user', 'root');
+ drush_set_default('makefile', $aegir_root . '/.drush/provision/aegir.make');
drush_print("Aegir $version automated install script");
drush_print("==============================================================================");
@@ -75,6 +76,7 @@ The following settings will be used:
Drush make version: !drush_make
Aegir version: !version
Aegir platform path: !root
+ Aegir makefile: !makefile
Client email: !email
', array('!site' => $site,
'!fqdn' => drush_get_option('aegir_host'),
@@ -87,6 +89,7 @@ The following settings will be used:
'!drush_make' => drush_get_option('drush_make_version'),
'!version' => drush_get_option('version'),
'!root' => drush_get_option(array('r', 'root')),
+ '!makefile' => drush_get_option('makefile'),
'!email' => drush_get_option('client_email'),
)));
@@ -144,7 +147,7 @@ function drush_provision_hostmaster_install($site = NULL) {
'server' => $server,
'web_server' => $server,
'root' => $platform,
- 'makefile' => $aegir_root . '/.drush/provision/aegir.make',
+ 'makefile' => drush_get_option('makefile'),
));
provision_backend_invoke($platform_name, 'provision-verify');