Update WP theme paths only when template_root in releases_path #840
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The update is needed only to fix the release subdirectory, so it is safest to condition the update upon the releases_path being in the template_root. This avoids overwriting less common template_root values such as subdirectories of plugins, etc.
|
Makes sense 👍 |
primozcigler
added a commit
to primozcigler/trellis
that referenced
this pull request
Jun 26, 2017
* master: (120 commits) Reload Nginx with updates to manual cert or key (roots#843) Add self signed certificates subdomains (roots#812) Add support for SMTP without authentication Remove output about running WP-CLI and Composer Option to install WP-CLI packages (roots#837) Update WP theme paths only when template_root in releases_path (roots#840) Update wp-cli to 1.2.1 (roots#838) skip plugins with WP-CLI, to avoid crappy plugins breaking deploys Add options for sources and version Add re-run vagrant up message Remove plugins from README Auto-install Vagrant plugins Fixes Add Vagrant config support Use python slice on password salt instead of Jinja2 truncate() Avoid single var containing jinja delimiters in when parameter Remove jinja delimiters from tasks' when parameter Update connection test for new dense.py callback in Ansible 2.3 Deploys: Make wp core update-db optional (roots#827) Use a block ... # Conflicts: # Vagrantfile # ansible.cfg
skemantix
pushed a commit
to skemantix/trellis
that referenced
this pull request
Sep 4, 2017
…#840) The update is needed only to fix the release subdirectory, so it is safest to condition the update upon the releases_path being in the template_root. This avoids overwriting less common template_root values such as subdirectories of plugins, etc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The update to WP theme paths is needed only if the WP
template_rootfalls in thereleasessubdirectory. The problem to solve — originally addressed by #275 then 632bbe8 — is that on deploy, thetemplate_rootwill sometimes retain the old releases path value, such as/srv/www/example.com/releases/20170614235048/web/wp/wp-content/themes, when in fact it needs to be assigned the new release path, such as/srv/www/example.com/releases/20170614235217(the newer date).This PR uses a safer condition in evaluating whether to update the theme paths. It performs the update only if the
releases_path(/srv/www/example.com/releases) appears in the retrievedtemplate_rootvalue. This revised condition avoids overwriting less commontemplate_rootvalues such as subdirectories of plugins. Such paths were not accounted for prior to this PR and would have been reset inappropriately, unintentionally deactivating such themes.