Merge pull request #647 from roots/improve-wp-home-site-url-variables

WP 4.6 Compat: set WP_HOME/SITEURL directly
roots · Sep 2, 2016 · f15444b · f15444b
2 parents c178ab9 + 4fa64a3
commit f15444b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -100,6 +100,10 @@ Vagrant.configure('2') do |config|
         'development' => ['default']
       }
 
+      if tags = ENV['ANSIBLE_TAGS']
+        ansible.tags = tags
+      end
+
       ansible.extra_vars = {'vagrant_version' => Vagrant::VERSION}
       if vars = ENV['ANSIBLE_VARS']
         extra_vars = Hash[vars.split(',').map { |pair| pair.split('=') }]

diff --git a/group_vars/all/helpers.yml b/group_vars/all/helpers.yml
@@ -4,8 +4,8 @@ wordpress_env_defaults:
   db_user: "{{ item.key | underscore }}"
   disable_wp_cron: true
   wp_env: "{{ env }}"
-  wp_home: "{{ item.value.ssl.enabled | default(false) | ternary('https', 'http') }}://${HTTP_HOST}"
-  wp_siteurl: "${WP_HOME}/wp"
+  wp_home: "{{ item.value.ssl.enabled | default(false) | ternary('https', 'http') }}://{{ site_hosts_canonical | first }}"
+  wp_siteurl: "{{ item.value.ssl.enabled | default(false) | ternary('https', 'http') }}://{{ site_hosts_canonical | first }}/wp"
 
 site_env: "{{ wordpress_env_defaults | combine(item.value.env | default({}), vault_wordpress_sites[item.key].env) }}"
 site_hosts_canonical: "{{ item.value.site_hosts | map(attribute='canonical') | list }}"