Update to tilelog v1.7.0

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index dc320eb8a3b55d765490b17b63481f3a5eb4b103..92ed283a613e9318489739d83c858ce6c08b06b3 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -72,7 +72,7 @@ end
 
 wordpress_theme "osmblog-wp-theme" do
   site "supporting.openstreetmap.org"
 
 wordpress_theme "osmblog-wp-theme" do
   site "supporting.openstreetmap.org"

-  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"
+  action :delete

 end
 
 wordpress_plugin "civicrm-wp-piwik" do
 end
 
 wordpress_plugin "civicrm-wp-piwik" do


@@ -161,12 +161,32 @@ directory extensions_directory do
 end
 
 node[:civicrm][:extensions].each_value do |details|
 end
 
 node[:civicrm][:extensions].each_value do |details|

-  git "#{extensions_directory}/#{details[:name]}" do
-    action :sync
-    repository details[:repository]
-    revision details[:revision]
-    user "wordpress"
-    group "wordpress"
+  if details[:repository]
+    git "#{extensions_directory}/#{details[:name]}" do
+      action :sync
+      repository details[:repository]
+      revision details[:revision]
+      user "wordpress"
+      group "wordpress"
+    end
+  elsif details[:zip]
+    remote_file "#{cache_dir}/#{details[:name]}.zip" do
+      source details[:zip]
+      owner "root"
+      group "root"
+      mode "644"
+      backup false
+    end
+
+    archive_file "#{cache_dir}/#{details[:name]}.zip" do
+      action :nothing
+      destination "#{extensions_directory}/#{details[:name]}"
+      strip_components 1
+      owner "wordpress"
+      group "wordpress"
+      overwrite true
+      subscribes :extract, "remote_file[#{cache_dir}/#{details[:name]}.zip]", :immediately
+    end

   end
 end
 
   end
 end