From: Guillaume RISCHARD <git@stereo.lu>
Date: Fri, 6 Oct 2023 20:55:53 +0000 (-0400)
Subject: civicrm version bump, new plugins, cleanup
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/8ee7a7b1bedbd7772b663fcd9d5507c8cd8d578b

civicrm version bump, new plugins, cleanup
---

diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb
index 7e4d230ba..f9a237494 100644
--- a/cookbooks/civicrm/attributes/default.rb
+++ b/cookbooks/civicrm/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:civicrm][:version] = "5.65.2"
+default[:civicrm][:version] = "5.66.0"
 
 # was used for SotM
 # default[:civicrm][:extensions][:cividiscount][:name] = "org.civicrm.module.cividiscount"
@@ -8,7 +8,7 @@ default[:civicrm][:version] = "5.65.2"
 # used to email people from civicrm
 default[:civicrm][:extensions][:emailapi][:name] = "org.civicoop.emailapi"
 default[:civicrm][:extensions][:emailapi][:repository] = "https://lab.civicrm.org/extensions/emailapi.git"
-default[:civicrm][:extensions][:emailapi][:revision] = "2.9"
+default[:civicrm][:extensions][:emailapi][:revision] = "2.11"
 
 # fancy email templates - INSTALL MANUALLY, NOT FROM GIT
 default[:civicrm][:extensions][:mosaico][:name] = "uk.co.vedaconsulting.mosaico"
@@ -25,9 +25,29 @@ default[:civicrm][:extensions][:donotsendreportemail][:repository] = "https://gi
 default[:civicrm][:extensions][:donotsendreportemail][:revision] = "3b31c2e0c62183872c7ecd244395fb8dcfbd5dbb"
 
 # make civicrm look nicer
-default[:civicrm][:extensions][:shoreditch][:name] = "org.civicrm.shoreditch"
-default[:civicrm][:extensions][:shoreditch][:repository] = "https://github.com/civicrm/org.civicrm.shoreditch.git"
-default[:civicrm][:extensions][:shoreditch][:revision] = "1.0.0-beta.12"
+default[:civicrm][:extensions][:shoreditch][:name] = "theisland"
+default[:civicrm][:extensions][:shoreditch][:repository] = "https://lab.civicrm.org/extensions/theisland.git"
+default[:civicrm][:extensions][:shoreditch][:revision] = "2.1.0"
+
+# civiprospect
+default[:civicrm][:extensions][:civiprospect][:name] = "uk.co.compucorp.civicrm.prospect"
+default[:civicrm][:extensions][:civiprospect][:repository] = "https://github.com/compucorp/uk.co.compucorp.civicrm.prospect.git"
+default[:civicrm][:extensions][:civiprospect][:revision] = "3.1.2"
+
+# advanced fundraising reports
+default[:civicrm][:extensions][:advancedfundraisingreports][:name] = "net.ourpowerbase.report.advancedfundraising"
+default[:civicrm][:extensions][:advancedfundraisingreports][:repository] = "https://github.com/jmcclelland/net.ourpowerbase.report.advancedfundraising.git"
+default[:civicrm][:extensions][:advancedfundraisingreports][:revision] = "3d5bd6cab70ba338bc85d42b4853dd4a6f8c9f9b"
+
+# membership churn report
+default[:civicrm][:extensions][:membershipchurn][:name] = "uk.co.vedaconsulting.membershipchurnchart"
+default[:civicrm][:extensions][:membershipchurn][:repository] = "https://github.com/veda-consulting/uk.co.vedaconsulting.membershipchurnchart.git"
+default[:civicrm][:extensions][:membershipchurn][:revision] = "v1.1"
+
+# pivot reports for civiprospect
+default[:civicrm][:extensions][:pivotreport][:name] = "uk.co.compucorp.civicrm.pivotreport"
+default[:civicrm][:extensions][:pivotreport][:repository] = "https://github.com/compucorp/uk.co.compucorp.civicrm.pivotreport.git"
+default[:civicrm][:extensions][:pivotreport][:revision] = "2.0.7"
 
 # extra rules for membership renewal
 default[:civicrm][:extensions][:membershipextra][:name] = "com.skvare.membershipextra"
diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 92ed283a6..dd6bd8342 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -70,11 +70,6 @@ wordpress_site "supporting.openstreetmap.org" do
   fpm_prometheus_port 11301
 end
 
-wordpress_theme "osmblog-wp-theme" do
-  site "supporting.openstreetmap.org"
-  action :delete
-end
-
 wordpress_plugin "civicrm-wp-piwik" do
   plugin "wp-piwik"
   site "supporting.openstreetmap.org"
@@ -92,6 +87,10 @@ wordpress_plugin "civicrm-admin-utilities" do
   site "supporting.openstreetmap.org"
 end
 
+wordpress_plugin "host-webfonts-local" do
+  site "supporting.openstreetmap.org"
+end
+
 civicrm_version = node[:civicrm][:version]
 civicrm_directory = "/srv/supporting.openstreetmap.org/wp-content/plugins/civicrm"