civicrm: pivotreport extension patch now only in original repo

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 92ed283a613e9318489739d83c858ce6c08b06b3..2aed4f64fba0b9c6923c054b55978608c1eb5f50 100644 (file)
--- 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,20 @@ wordpress_plugin "civicrm-admin-utilities" do
   site "supporting.openstreetmap.org"
 end
 
+wordpress_plugin "host-webfonts-local" do
+  site "supporting.openstreetmap.org"
+end
+
+wordpress_theme "morden" do
+  site "supporting.openstreetmap.org"
+  repository "https://public-api.wordpress.com/rest/v1/themes/download/morden.zip"
+end
+
+wordpress_theme "varia" do
+  site "supporting.openstreetmap.org"
+  repository "https://public-api.wordpress.com/rest/v1/themes/download/varia.zip"
+end
+
 civicrm_version = node[:civicrm][:version]
 civicrm_directory = "/srv/supporting.openstreetmap.org/wp-content/plugins/civicrm"
 
@@ -207,17 +216,29 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%credKeys%%/, cred_keys)
   line.gsub!(/%%signKeys%%/, sign_keys)
   line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/supporting.openstreetmap.org');")
+  # Don't recompile smarty templates on every call https://docs.civicrm.org/sysadmin/en/latest/setup/optimizations/#disable-compile-check
+  line.gsub!(%r{//  define\('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE\);}, "define('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE);")
 
   line
 end
 
-file "#{civicrm_directory}/civicrm.settings.php" do
+directory "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm" do
+  owner "www-data"
+  group "www-data"
+  mode "755"
+end
+
+file "/srv/supporting.openstreetmap.org/wp-content/uploads/civicrm/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"
   mode "644"
   content settings
 end
 
+file "#{civicrm_directory}/civicrm.settings.php" do
+  action :delete
+end
+
 systemd_service "osmf-crm-jobs" do
   description "Run CRM jobs"
   exec_start "/usr/bin/php #{civicrm_directory}/civicrm/bin/cli.php -s supporting.openstreetmap.org -u batch -p \"#{passwords['batch']}\" -e Job -a execute"