summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2010-11-22 21:54:03 (GMT)
committeranarcat2010-11-22 21:54:03 (GMT)
commiteb92e52f03d4dfa6ca0d89cb2de0ca2904257812 (patch)
tree530c885bd04d1c049344da6626ed962bd944bc03
parenta589533eccaf78273dc36fd2a6cb2fd447dbc2cf (diff)
#977024 - set the default DB server to be localhost
-rw-r--r--install.hostmaster.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index ba7b78e..3487b9d 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -33,8 +33,7 @@ Don't worry: you will get to review those settings after the final install");
drush_set_option('site', $site);
drush_set_default('aegir_host', provision_fqdn());
- $aegir_host = drush_get_option('aegir_host');
- drush_set_default('aegir_db_host', $aegir_host);
+ drush_set_default('aegir_db_host', 'localhost');
if (is_null(drush_get_option('aegir_db_pass', NULL))) {
// XXX: may not be portable everywhere?
@@ -44,10 +43,10 @@ Don't worry: you will get to review those settings after the final install");
print "\n"; // add a newline since the user's didn't print
}
- if ($aegir_host == 'localhost') {
+ if (drush_get_option('aegir_host') == 'localhost') {
$default_email = 'webmaster@example.com';
} else {
- $default_email = 'webmaster@' . $aegir_host;
+ $default_email = 'webmaster@' . drush_get_option('aegir_host');
}
while (!filter_var(drush_get_option('client_email'), FILTER_VALIDATE_EMAIL)) {
$client_email = drush_prompt(dt("Admin user e-mail"), $default_email);