Fix: vault_wordpress_env_defaults not populated during deploy

Follow up on #1048
roots · Dec 17, 2018 · 83f7163 · 83f7163
1 parent cb57393
commit 83f7163
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Fix: `vault_wordpress_env_defaults` not populated during deploy ([#1049](https://github.com/roots/trellis/pull/1049))
 * Add `vault_wordpress_env_defaults` ([#1048](https://github.com/roots/trellis/pull/1048))
 * Allow overriding rollback variables ([#1047](https://github.com/roots/trellis/pull/1047))
 * Require Vagrant >= 2.1.0 ([#1046](https://github.com/roots/trellis/pull/1046))

diff --git a/roles/deploy/vars/main.yml b/roles/deploy/vars/main.yml
@@ -8,4 +8,4 @@ wordpress_env_defaults:
   wp_siteurl: "{{ project.ssl.enabled | default(false) | ternary('https', 'http') }}://{{ project.site_hosts | map(attribute='canonical') | first }}/wp"
   domain_current_site: "{{ project.site_hosts | map(attribute='canonical') | first }}"
 
-site_env: "{{ wordpress_env_defaults | combine(project.env | default({}), vault_wordpress_sites[site].env) }}"
+site_env: "{{ wordpress_env_defaults | combine(vault_wordpress_env_defaults | default({}), project.env | default({}), vault_wordpress_sites[site].env) }}"