diff --git a/RELEASE.md b/RELEASE.md index f98017b19c..547652c862 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,7 +12,7 @@ To perform a release: * [BLT 8.x](https://github.com/acquia/blt): [![Build Status](https://travis-ci.org/acquia/blt.svg?branch=8.x)](https://travis-ci.org/acquia/blt) * [BLTed 8.x Travis](https://github.com/acquia-pso/blted8): [![Build Status](https://travis-ci.org/acquia-pso/blted8.svg?branch=8.x)](https://travis-ci.org/acquia-pso/blted8) * [BLTed 8.x Pipelines](https://cloud.acquia.com/app/develop/applications/d74d1e87-f611-4e46-ba11-3e9b29cdcbdb/pipelines) -* [![Documentation Status](https://readthedocs.org/projects/blt/badge/?version=8.x)](http://blt.readthedocs.io/en/8.x/?badge=8.x) +* [![Documentation Status](https://readthedocs.org/projects/blt/badge/?version=8.x)](http://blt.readthedocs.io/en/9.x/?badge=8.x) ## Testing diff --git a/readme/config-split.md b/readme/config-split.md index 7a7bebcc24..cd6d44a248 100644 --- a/readme/config-split.md +++ b/readme/config-split.md @@ -193,7 +193,7 @@ Consider that we would like site to to have different cache lifetimes then the d ## Executing commands against multisites - When executing a drush command against a multisite, include the `uri` option. For instance, `drush --uri=site2`. -- When executing a BLT command against a multisite, include the site config value. For instance, `blt setup --define site=site2`. BLT also allows you to create site-specific configuration, see [BLT multisite documentation](http://blt.readthedocs.io/en/8.x/readme/multisite/) for more information. +- When executing a BLT command against a multisite, include the site config value. For instance, `blt setup --define site=site2`. BLT also allows you to create site-specific configuration, see [BLT multisite documentation](http://blt.readthedocs.io/en/9.x/readme/multisite/) for more information. # Profile split @@ -249,6 +249,6 @@ This will obviate the need to clear caches in order to register a status change # Resources * [blog post by Jeff Geerling](https://www.jeffgeerling.com/blog/2017/adding-configuration-split-drupal-site-using-blt-and-acquia-cloud) -* [BLT multisite documentation](http://blt.readthedocs.io/en/8.x/readme/multisite/) +* [BLT multisite documentation](http://blt.readthedocs.io/en/9.x/readme/multisite/) * [Configuration split](https://www.drupal.org/project/config_split) * [Configuration ignore](https://www.drupal.org/project/config_ignore) diff --git a/readme/creating-new-project.md b/readme/creating-new-project.md index 24eb465c19..3d8544805a 100644 --- a/readme/creating-new-project.md +++ b/readme/creating-new-project.md @@ -24,7 +24,7 @@ To customize your VM (such as to enable Solr or change the PHP version), respond *no* when BLT offers to boot your VM, and [make any necessary modifications](http://docs.drupalvm.com/en/latest/getting-started/configure-drupalvm/) to *box/config.yml* before starting your VM. - 1. **Alternative**: To set up your own LAMP stack, please review [Local Development](http://blt.readthedocs.io/en/8.x/readme/local-development/), then execute the following command to generate default local settings files: + 1. **Alternative**: To set up your own LAMP stack, please review [Local Development](http://blt.readthedocs.io/en/9.x/readme/local-development/), then execute the following command to generate default local settings files: blt blt:init:settings diff --git a/readme/local-development.md b/readme/local-development.md index a9ccd39591..dcad198eed 100644 --- a/readme/local-development.md +++ b/readme/local-development.md @@ -5,7 +5,7 @@ Acquia currently recommends the use of either: * [Drupal VM](#using-drupal-vm-for-blt-generated-projects): An isolated virtual machine, built with Vagrant and Ansible. * [Acquia Dev Desktop](#using-acquia-dev-desktop-for-blt-generated-projects): A turn-key LAMP stack tailored specifically for Acquia-hosted Drupal sites. - * [Alternative local development environments](http://blt.readthedocs.io/en/8.x/readme/local-development/#alternative-local-development-environments) + * [Alternative local development environments](http://blt.readthedocs.io/en/9.x/readme/local-development/#alternative-local-development-environments) No matter what local environment you choose to use, the following guidelines should be followed: diff --git a/scripts/config-split/templates/README.md.twig b/scripts/config-split/templates/README.md.twig index f1667d14cf..67fe0d854c 100644 --- a/scripts/config-split/templates/README.md.twig +++ b/scripts/config-split/templates/README.md.twig @@ -1 +1 @@ -This directory contains configuration to be imported into your Drupal site via config_split for the {{ name }} environment. See [configuration management](http://blt.readthedocs.io/en/8.x/readme/configuration-management/) for more information. +This directory contains configuration to be imported into your Drupal site via config_split for the {{ name }} environment. See [configuration management](http://blt.readthedocs.io/en/9.x/readme/configuration-management/) for more information. diff --git a/src/Robo/Commands/Acsf/AcsfCommand.php b/src/Robo/Commands/Acsf/AcsfCommand.php index e52af24fb8..a5aa68eea7 100644 --- a/src/Robo/Commands/Acsf/AcsfCommand.php +++ b/src/Robo/Commands/Acsf/AcsfCommand.php @@ -23,7 +23,7 @@ public function printPreamble() { $this->logger->notice(" * Adding `acsf` to `modules.local.uninstall` in your blt.yml"); $this->logger->notice(""); $this->logger->notice("For more information, see:"); - $this->logger->notice("http://blt.readthedocs.io/en/8.x/readme/acsf-setup"); + $this->logger->notice("http://blt.readthedocs.io/en/9.x/readme/acsf-setup"); } /** diff --git a/src/Robo/Commands/Blt/UpdateCommand.php b/src/Robo/Commands/Blt/UpdateCommand.php index 501985cf42..34e44f7183 100644 --- a/src/Robo/Commands/Blt/UpdateCommand.php +++ b/src/Robo/Commands/Blt/UpdateCommand.php @@ -54,7 +54,7 @@ public function createProject() { $this->displayArt(); $this->yell("Your new BLT-based project has been created in {$this->getConfigValue('repo.root')}."); $this->say("Please continue by following the \"Creating a new project with BLT\" instructions:"); - $this->say("http://blt.readthedocs.io/en/8.x/readme/creating-new-project/"); + $this->say("http://blt.readthedocs.io/en/9.x/readme/creating-new-project/"); } /** diff --git a/src/Robo/Commands/Git/GitCommand.php b/src/Robo/Commands/Git/GitCommand.php index 7b190129b4..3d77d3241c 100644 --- a/src/Robo/Commands/Git/GitCommand.php +++ b/src/Robo/Commands/Git/GitCommand.php @@ -25,8 +25,8 @@ public function commitMsgHook($message) { if (!preg_match($pattern, $message)) { $this->logger->error("Invalid commit message!"); $this->say("Commit messages must conform to the regex $pattern"); - $this->logger->notice("To disable this command, see http://blt.rtfd.io/en/8.x/readme/extending-blt/#disabling-a-command"); - $this->logger->notice("To customize git hooks, see http://blt.rtfd.io/en/8.x/readme/extending-blt/#setupgit-hooks."); + $this->logger->notice("To disable this command, see http://blt.rtfd.io/en/9.x/readme/extending-blt/#disabling-a-command"); + $this->logger->notice("To customize git hooks, see http://blt.rtfd.io/en/9.x/readme/extending-blt/#setupgit-hooks."); return 1; } diff --git a/src/Robo/Commands/Setup/ConfigCommand.php b/src/Robo/Commands/Setup/ConfigCommand.php index 64773be4d8..017740a62a 100644 --- a/src/Robo/Commands/Setup/ConfigCommand.php +++ b/src/Robo/Commands/Setup/ConfigCommand.php @@ -4,6 +4,7 @@ use Acquia\Blt\Robo\BltTasks; use Acquia\Blt\Robo\Exceptions\BltException; +use Symfony\Component\Yaml\Yaml; /** * Defines commands in the "setup:config*" namespace. @@ -66,6 +67,17 @@ public function import() { // necessary configuration file(s) as part of the db update. ->drush("updb"); + // Retrieve the config UUID and set site UUID to allow config import + // for existing sites. + // @see https://github.com/acquia/blt/issues/2565 + // @see https://www.drupal.org/project/drupal/issues/1613424 + $site_config_file = $this->getConfigValue('docroot') . '/' . $this->getConfigValue("cm.core.dirs.$cm_core_key.path") . '/system.site.yml'; + if (file_exists($site_config_file)) { + $site_config_contents = Yaml::parseFile($site_config_file); + $site_uuid = $site_config_contents['uuid']; + $task->drush("config:set system.site uuid $site_uuid"); + } + switch ($strategy) { case 'core-only': $this->importCoreOnly($task, $cm_core_key); diff --git a/src/Update/Updates.php b/src/Update/Updates.php index 5c9ed61a13..df46c16f32 100644 --- a/src/Update/Updates.php +++ b/src/Update/Updates.php @@ -266,7 +266,7 @@ public function update_8007000() { $messages = [ 'BLT will no longer directly modify your composer.json requirements!', "Default composer.json values from BLT are now merged into your root composer.json via wikimedia/composer-merge-plugin. Please see the following documentation for more information:\n", - " - http://blt.readthedocs.io/en/8.x/readme/updating-blt/#modifying-blts-default-composer-values\n - https://github.com/wikimedia/composer-merge-plugin" + " - http://blt.readthedocs.io/en/9.x/readme/updating-blt/#modifying-blts-default-composer-values\n - https://github.com/wikimedia/composer-merge-plugin" ]; $formattedBlock = $this->updater->getFormatter()->formatBlock($messages, 'ice'); @@ -324,7 +324,7 @@ public function update_8009000() { " - Re-initialize default Travis CI configuration via `blt recipes:ci:travis:init`. - Re-initialize default Acquia Pipelines configuration via `blt recipes:ci:pipelines:init`.", " - Port custom Phing commands to Robo. All Phing commands are now obsolete. See:", - " http://blt.readthedocs.io/en/8.x/readme/extending-blt/", + " http://blt.readthedocs.io/en/9.x/readme/extending-blt/", ]; if (file_exists($this->updater->getRepoRoot() . '/blt/composer.overrides.json')) { $messages[] = " - blt/composer.overrides.json is no longer necessary."; diff --git a/template/config/envs/README.md b/template/config/envs/README.md index 74c8278d44..6255212860 100644 --- a/template/config/envs/README.md +++ b/template/config/envs/README.md @@ -1 +1 @@ -Create environment-based directories here which will contain configuration to be imported into your Drupal site via config_split for the currently active environment. See [configuration management](http://blt.readthedocs.io/en/8.x/readme/configuration-management/) for more information. +Create environment-based directories here which will contain configuration to be imported into your Drupal site via config_split for the currently active environment. See [configuration management](http://blt.readthedocs.io/en/9.x/readme/configuration-management/) for more information.