apache ssl: Do not pass OCSP stapling failures to client

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index d7453f8888457f9d927f822f1978afc79ae2e658..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"]
@@ -45,16 +47,16 @@ civicrm_version = node[:civicrm][:version]
 civicrm_directory = "/srv/crm.osmfoundation.org/wp-content/plugins/civicrm"
 
 directory "/opt/civicrm-#{civicrm_version}" do
-  owner "root"
-  group "root"
+  owner "wordpress"
+  group "wordpress"
   mode 0755
 end
 
 remote_file "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
   action :create_if_missing
   source "http://downloads.sourceforge.net/project/civicrm/civicrm-stable/#{civicrm_version}/civicrm-#{civicrm_version}-wordpress.zip"
-  owner "root"
-  group "root"
+  owner "wordpress"
+  group "wordpress"
   mode 0644
   backup false
 end
@@ -62,8 +64,8 @@ end
 remote_file "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do
   action :create_if_missing
   source "http://downloads.sourceforge.net/project/civicrm/civicrm-stable/#{civicrm_version}/civicrm-#{civicrm_version}-l10n.tar.gz"
-  owner "root"
-  group "root"
+  owner "wordpress"
+  group "wordpress"
   mode 0644
   backup false
 end
@@ -72,22 +74,27 @@ execute "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
   action :nothing
   command "unzip -qq /var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip"
   cwd "/opt/civicrm-#{civicrm_version}"
-  user "root"
-  group "root"
-  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip]"
+  user "wordpress"
+  group "wordpress"
+  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
 end
 
 execute "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do
   action :nothing
   command "tar -zxf /var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz"
   cwd "/opt/civicrm-#{civicrm_version}/civicrm"
-  user "root"
-  group "root"
-  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]"
+  user "wordpress"
+  group "wordpress"
+  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
 end
 
-link civicrm_directory do
-  to "/opt/civicrm-#{civicrm_version}/civicrm"
+execute "/opt/civicrm-#{civicrm_version}/civicrm" do
+  action :nothing
+  command "rsync --archive --delete /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}"
+  user "wordpress"
+  group "wordpress"
+  subscribes :run, "execute[/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :run, "execute[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
 end
 
 directory "/srv/crm.osmfoundation.org/wp-content/plugins/files" do
@@ -106,21 +113,29 @@ 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
-  owner "root"
-  group "root"
+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 "root"