Commit 28b81037 authored by mig5's avatar mig5 Committed by mig5

#1047922 introduce more compatibility with drush 4, to avoid breaking files...

#1047922 introduce more compatibility with drush 4, to avoid breaking files table updating on migrate/clone, and possibly issues with upgrading aegir when using nginx
parent fd89cd37
......@@ -64,13 +64,14 @@ We are making the following assumptions:
// add a server record :
$server = '@server_master';
$context = drush_get_context('cli') ? 'cli' : 'options';
drush_backend_invoke_args("provision-save", array($server), array(
'context_type' => 'server',
'aegir_root' => dirname(rtrim($data['config_path'], '/')),
'remote_host' => php_uname('n'),
'script_user' => $data['script_user'],
// apache or nginx or..
'http_service_type' => drush_get_option('http_service_type', 'apache', 'options'),
'http_service_type' => drush_get_option('http_service_type', 'apache', $context),
'web_group' => $data['web_group'],
'master_url' => $data['master_url'],
'restart_cmd' => $data['restart_cmd'],
......
......@@ -2,7 +2,8 @@
// $Id$
$new_url = d()->uri;
$old_url = drush_get_option('old_uri', $new_url, 'options');
$context = drush_get_context('cli') ? 'cli' : 'options';
$old_url = drush_get_option('old_uri', $new_url, $context);
/**
* @file
......
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