Commit e68317a4 authored by drumm's avatar drumm Committed by Neil Drumm

Merge branch 'dev-services' of ssh://gitosis@git.aegirproject.org/provision into dev-services

parents ef16eca2 ca1c4d40
......@@ -39,9 +39,9 @@ class provisionService_http extends provisionService {
// Set up defines for platform
$docroot = drush_get_option(array("r", "root"), $_SERVER['PWD']);
$path = drush_set_default('docroot_path', rtrim(($docroot) ? $docroot : $_SERVER['DOCUMENT_ROOT'], '/'));
$path = drush_set_default('publish_path', rtrim(($docroot) ? $docroot : $_SERVER['DOCUMENT_ROOT'], '/'));
drush_set_default('sites_path', $path . '/sites');
drush_set_default('publish_path', realpath(drush_get_option('docroot_path')));
drush_set_default('publish_path', realpath(drush_get_option('publish_path')));
$parts = explode("/", $path);
array_pop($parts);
......
......@@ -397,7 +397,7 @@ function _provision_drupal_maintain_aliases($url) {
}
foreach($aliases as $alias) {
if (trim($alias)) {
provision_service('file')->symlink($url, drush_get_option('docroot_path') . '/sites/' . $alias)
provision_service('file')->symlink($url, drush_get_option('publish_path') . '/sites/' . $alias)
->succeed('Created symlink for alias @target')
->fail('Could not create symlink for alias @target');
}
......@@ -421,7 +421,7 @@ function _provision_drupal_delete_aliases($aliases, $silent = false) {
}
foreach ($aliases as $alias) {
if ($alias = trim($alias)) {
provision_service('file')->unlink(drush_get_option('docroot_path') . '/sites/' . $alias)
provision_service('file')->unlink(drush_get_option('publish_path') . '/sites/' . $alias)
->succeed('Removed symlink for alias @path')
->fail($error);
}
......
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