diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb index 0793e418d..af35076d5 100644 --- a/cookbooks/civicrm/attributes/default.rb +++ b/cookbooks/civicrm/attributes/default.rb @@ -11,10 +11,8 @@ default[:civicrm][:extensions][:emailapi][:revision] = "2.9" # fancy email templates -# Do not update from git! See https://civicrm.stackexchange.com/questions/25763/mosaico-packages-are-missing-beta-4 -# default[:civicrm][:extensions][:mosaico][:name] = "uk.co.vedaconsulting.mosaico" -# default[:civicrm][:extensions][:mosaico][:repository] = "https://github.com/veda-consulting-company/uk.co.vedaconsulting.mosaico.git" -# default[:civicrm][:extensions][:mosaico][:revision] = "3.2" +default[:civicrm][:extensions][:mosaico][:name] = "uk.co.vedaconsulting.mosaico" +default[:civicrm][:extensions][:mosaico][:zip] = "https://download.civicrm.org/extension/uk.co.vedaconsulting.mosaico/3.2.1691060437/uk.co.vedaconsulting.mosaico-3.2.1691060437.zip" # validate that osm username exists, simple check default[:civicrm][:extensions][:username][:name] = "org.openstreetmap.username" diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index f74692014..389aefd59 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -161,12 +161,32 @@ 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 + path "#{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