Commit 8de832df authored by anarcat's avatar anarcat Committed by anarcat

use FQDN as default for site name and server name

we now prompt the user for the server name explicitely if not provided
parent 501e41a1
......@@ -48,14 +48,17 @@ We are making the following assumptions:
function drush_provision_hostmaster_install($site = NULL) {
if (!$site) {
$site = drush_prompt(dt("Aegir domain name"), "");
$site = drush_prompt(dt("Aegir domain name"), provision_fqdn());
$version = drush_get_option('version', 'HEAD');
$aegir_root = drush_get_option('aegir_root', drush_server_home());
$platform = drush_get_option(array('r', 'root'), $aegir_root . '/' . 'hostmaster-' . $version);
$aegir_host = drush_get_option('aegir_host', php_uname('n'), 'options');
$aegir_host = drush_get_option('aegir_host', NULL, 'options');
if (is_null($aegir_host)) {
$aegir_host = drush_prompt(dt("Master server FQDN"), provision_fqdn());
$aegir_db_user = drush_get_option('aegir_db_user', 'root', 'options');
$aegir_db_pass = drush_get_option('aegir_db_pass', NULL, 'options');
if (!$aegir_db_pass) {
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