Merge branch 'master' into release

vccw-team · Jul 19, 2015 · b439e75 · b439e75
2 parents cb196dc + 1d17761
commit b439e75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -102,7 +102,7 @@ Vagrant.configure(2) do |config|
         :listen_ports => ['80', '443']
       },
       :php => {
-        :packages => %w(php php-cli php-devel php-mbstring php-gd php-xml php-mysql),
+        :packages => %w(php php-cli php-devel php-mbstring php-gd php-xml php-mysql php-pecl-xdebug),
         :directives => {
             'default_charset'            => 'UTF-8',
             'mbstring.language'          => 'neutral',

diff --git a/provision/site-cookbooks/wpcli/recipes/install.rb b/provision/site-cookbooks/wpcli/recipes/install.rb
@@ -180,13 +180,7 @@
       user node[:wpcli][:user]
       group node[:wpcli][:group]
       cwd File.join(node[:wpcli][:wp_docroot], node[:wpcli][:wp_siteurl])
-      code "WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp theme install #{Shellwords.shellescape(node[:wpcli][:default_theme])}"
-    end
-    bash "WordPress #{node[:wpcli][:default_theme]} activate" do
-      user node[:wpcli][:user]
-      group node[:wpcli][:group]
-      cwd File.join(node[:wpcli][:wp_docroot], node[:wpcli][:wp_siteurl])
-      code "WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp theme activate #{File.basename(Shellwords.shellescape(node[:wpcli][:default_theme])).sub(/\..*$/, '')}"
+      code "WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp theme install #{Shellwords.shellescape(node[:wpcli][:default_theme])} --activate"
     end
 end