Merge remote-tracking branch 'github/pull/324'

[chef.git] / cookbooks / civicrm / recipes / default.rb

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 6e492e224c43ebe5ad002f68be7f467e1e065e5b..7252f61f9e8f733a8383b036e36d17009a8522b6 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -20,7 +20,11 @@
 include_recipe "wordpress"
 include_recipe "mysql"
 
-package "wkhtmltopdf"
+package %w[
+  rsync
+  unzip
+  wkhtmltopdf
+]
 
 cache_dir = Chef::Config[:file_cache_path]
 
@@ -46,7 +50,7 @@ end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"
-  repository "git://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "registration-honeypot" do
@@ -56,6 +60,7 @@ end
 wordpress_plugin "sitepress-multilingual-cms" do
   site "join.osmfoundation.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  not_if { ENV["TEST_KITCHEN"] }
 end
 
 wordpress_plugin "contact-form-7" do
@@ -135,6 +140,7 @@ node[:civicrm][:extensions].each_value do |details|
     action :sync
     repository details[:repository]
     revision details[:revision]
+    depth 1
     user "wordpress"
     group "wordpress"
   end