Fixes for building cgimap on 14.04 machines

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 27875bead23106a9920579d1fca89829e5a57ca3..992d928bec6299a0133345f8f3906cc6b3f7359a 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -20,6 +20,8 @@
 include_recipe "wordpress"
 include_recipe "mysql"
 
+package "wkhtmltopdf"
+
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]
@@ -111,25 +113,33 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%dbPass%%/, database_password)
   line.gsub!(/%%dbHost%%/, "localhost")
   line.gsub!(/%%dbName%%/, "civicrm")
-  line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm")
-  line.gsub!(/%%templateCompileDir%%/, "/srv/crm.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c")
+  line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/")
+  line.gsub!(/%%templateCompileDir%%/, "/srv/crm.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/")
   line.gsub!(/%%baseURL%%/, "http://crm.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
 
   line
 end
 
-file "#{civicrm_directory}/civicrm/civicrm.settings.php" do
+file "#{civicrm_directory}/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"
   mode 0644
   content settings
 end
 
+template "/etc/cron.d/osmf-crm" do
+  source "cron.erb"
+  owner "root"
+  group "root"
+  mode 0600
+  variables :directory => civicrm_directory, :passwords => passwords
+end
+
 template "/etc/cron.daily/osmf-crm-backup" do
   source "backup.cron.erb"
-  owner "wordpress"
-  group "wordpress"
+  owner "root"
+  group "root"
   mode 0750
   variables :passwords => passwords
 end