Commit 42bed12b authored by helmo's avatar helmo

Issue #1945950 by helmo: Rename provision_drupal_sync_site_back().

parent 7b6dd11c
......@@ -59,7 +59,7 @@ function drush_provision_drupal_provision_backup() {
// synch all filesystem changes back from the remote server.
provision_drupal_sync_site_back();
provision_drupal_fetch_site();
// Check if we are currently cloaking credentials
$cloaked = d()->service('http')->cloaked_db_creds();
......@@ -73,7 +73,7 @@ function drush_provision_drupal_provision_backup() {
// Write the uncloaked credentials to the settings.php
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
}
......@@ -101,7 +101,7 @@ function drush_provision_drupal_provision_backup() {
drush_log(dt("Re-cloaking database credentials after backup"));
drush_set_option('provision_db_cloaking', TRUE);
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
}
......
......@@ -33,7 +33,7 @@ function drush_provision_drupal_provision_delete() {
// Remove the symlink in the clients directory.
_provision_client_delete_symlink();
provision_drupal_sync_site($override_slave_authority = TRUE);
provision_drupal_push_site($override_slave_authority = TRUE);
}
elseif (d()->type === 'platform') {
if (!drush_get_option('force', FALSE) && drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_ROOT) && provision_drupal_find_sites()) {
......
......@@ -84,7 +84,7 @@ function drush_provision_drupal_pre_provision_deploy($backup_file) {
// Load the newly created information, including re-loading the new db creds.
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
_provision_drupal_create_settings_file();
provision_drupal_sync_site($override_slave_authority = TRUE);
provision_drupal_push_site($override_slave_authority = TRUE);
$site_packages = drush_get_option('packages', array(), 'site');
$drupal_packages = drush_get_option('packages', array(), 'drupal');
......
......@@ -50,7 +50,7 @@ function drush_provision_drupal_provision_install() {
// Requires at least the database settings to complete.
provision_prepare_environment();
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
provision_save_site_data();
......
......@@ -26,7 +26,7 @@ function drush_provision_drupal_pre_provision_migrate($platform, $new_uri = NULL
d()->site_enabled = FALSE;
_provision_drupal_create_settings_file();
drush_invoke('provision-backup');
provision_drupal_sync_site();
provision_drupal_push_site();
drush_set_option('old_platform', d()->platform->name);
......@@ -58,7 +58,7 @@ function drush_provision_drupal_pre_provision_migrate_rollback($platform, $new_u
drush_log(dt("Bringing site out of maintenance"));
d()->site_enabled = true;
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
$success = provision_file()->unlink(drush_get_option('backup_file'))
->succeed('Removed unused migration site package')
......
......@@ -99,7 +99,7 @@ function drush_provision_drupal_provision_install_backend() {
* Overwrite e.g. the files directory on the slave.
* Useful when the master server has donw file operations, such as restoring a backup.
*/
function provision_drupal_sync_site($override_slave_authority = FALSE) {
function provision_drupal_push_site($override_slave_authority = FALSE) {
provision_file()->create_dir(d()->server->http_platforms_path, dt("Platforms"), 0755);
d()->server->sync(d()->server->http_platforms_path, array(
......@@ -145,7 +145,7 @@ function provision_drupal_sync_site($override_slave_authority = FALSE) {
*
* E.g. before a backup is made.
*/
function provision_drupal_sync_site_back() {
function provision_drupal_fetch_site() {
// synch filesystem changes back from the remote server.
d()->service('http')->fetch(d()->site_path . '/files/');
......
......@@ -11,7 +11,7 @@ function drush_provision_drupal_provision_verify_validate() {
provision_prepare_environment();
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
drush_errors_on();
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_FULL);
......@@ -78,7 +78,7 @@ function drush_provision_drupal_pre_provision_verify() {
drush_set_option('sites', array_keys((array) provision_drupal_find_sites()), 'drupal');
drush_log(dt("This platform is running @short_name @version", array('@short_name' => 'drupal', '@version' => VERSION)));
drush_set_option('packages', _scrub_object(provision_find_packages()), 'drupal');
provision_drupal_sync_site();
provision_drupal_push_site();
}
elseif (d()->type === 'site') {
drush_set_option('packages', _scrub_object(provision_drupal_system_map()), 'site');
......@@ -89,7 +89,7 @@ function drush_provision_drupal_pre_provision_verify() {
_provision_drupal_create_settings_file();
provision_drupal_sync_site();
provision_drupal_push_site();
}
}
......
......@@ -171,7 +171,7 @@ function provision_save_site_data() {
if (!drush_get_error()) {
$config = new Provision_Config_Drushrc_Site(d()->name);
$config->write();
provision_drupal_sync_site();
provision_drupal_push_site();
}
}
......@@ -183,7 +183,7 @@ function provision_save_platform_data() {
if (!drush_get_error()) {
$config = new Provision_Config_Drushrc_Platform(d()->name);
$config->write();
provision_drupal_sync_site();
provision_drupal_push_site();
}
}
......
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