merge master

vccw-team · Jan 19, 2015 · ecafb92 · ecafb92
2 parents a352523 + e3be1cc
commit ecafb92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -33,7 +33,7 @@ WP_DB_PASS           = 'wordpress'
 
 WP_DB_ROOT_PASS      = 'wordpress'
 
-WP_DEFAULT_PLUGINS   = %w(theme-check debug-bar dynamic-hostname)
+WP_DEFAULT_PLUGINS   = %w(dynamic-hostname wp-total-hacks tinymce-templates)
 WP_DEFAULT_THEME     = ENV["wp_theme"] || '' # e.g. twentyfifteen
 WP_OPTIONS           = {}
 WP_REWRITE_STRUCTURE = '/archives/%post_id%'
@@ -88,7 +88,7 @@ Vagrant.configure(2) do |config|
 
     chef.json = {
       :apache => {
-        :docroot_dir  => File.join("/var", DOCUMENT_ROOT),
+        :docroot_dir  => DOCUMENT_ROOT,
         :user         => 'vagrant',
         :group        => 'vagrant',
         :listen_ports => ["80", "443"]

diff --git a/provision/site-cookbooks/wpcli/recipes/install.rb b/provision/site-cookbooks/wpcli/recipes/install.rb
@@ -243,7 +243,7 @@
 remote_file node[:wpcli][:gitignore] do
   source node[:wpcli][:gitignore_url]
   mode 0644
-  action :create
+  action :create_if_missing
 end
 
 apache_site "000-default" do