Commit a23f4e46 authored by Adrian Rossouw's avatar Adrian Rossouw

Merge branch 'dev-envobject' of ssh://git.aegirproject.org/provision into dev-envobject

Conflicts:
	provision.environment.inc
parents c4dae0c9 432ea0d2
......@@ -5,7 +5,6 @@
*/
function drush_provision_hostmaster_install($site) {
drush_set_option('alias-path', drush_server_home() . '/.drush/aliases');
if (!$site) {
return drush_set_error('SITE_MISSING', dt('You need to specify the FQDN of the hostmaster install'));
}
......
......@@ -165,7 +165,7 @@ class provisionConfig_drushrc_alias extends provisionConfig_drushrc {
}
function filename() {
return drush_get_option('alias-path', drush_server_home() . '/.drush/aliases') . '/' . $this->data['aliasname'] . '.alias.drushrc.php';
return drush_server_home() . '/.drush/' . $this->data['aliasname'] . '.alias.drushrc.php';
}
}
......
......@@ -184,7 +184,6 @@ class provisionServer extends provisionEnvironment {
'--aegir_root' => 'server: Aegir root; default /var/aegir',
'--backup_path' => 'server: Aegir backup path; default {aegir_root}/backup',
'--config_path' => 'server: Aegir configuration path; default {aegir_root}/config',
'--alias_path' => 'server: Aegir Drush alias path; default {config_path}/drush.d',
'--master_url' => 'server: Hostmaster URL',
);
foreach (drush_command_invoke_all('provision_services') as $service => $default) {
......@@ -213,7 +212,6 @@ class provisionServer extends provisionEnvironment {
$this->setProperty('aegir_root', '/var/aegir');
$this->setProperty('backup_path', $this->aegir_root . '/backups');
$this->setProperty('config_path', $this->aegir_root . '/config');
$this->setProperty('alias_path', $this->config_path . '/drush.d');
$this->setProperty('master_url');
$this->load_services();
}
......
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