Make nftables block various invalid TCP flag combinations

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 66ba6bde25769d7ed89ddb6efa6b8035e0d7c7fc..89ba93a42b060cbb75fbb19d5e559d1227c94c0b 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: civicrm
+# Cookbook:: civicrm

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -20,12 +20,23 @@
 include_recipe "wordpress"
 include_recipe "mysql"
 
 include_recipe "wordpress"
 include_recipe "mysql"
 

-package "wkhtmltopdf"
+package %w[
+  php-xml
+  php-curl
+  rsync
+  wkhtmltopdf
+  php-bcmath
+  php-intl
+]
+
+cache_dir = Chef::Config[:file_cache_path]

 
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]
 
 passwords = data_bag_item("civicrm", "passwords")
 
 database_password = passwords["database"]

-site_key = passwords["key"]
+site_key = passwords["site_key"]
+cred_keys = passwords["cred_keys"]
+sign_keys = passwords["sign_keys"]

 
 mysql_user "civicrm@localhost" do
   password database_password
 
 mysql_user "civicrm@localhost" do
   password database_password


@@ -40,23 +51,23 @@ wordpress_site "join.osmfoundation.org" do
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password
   database_name "civicrm"
   database_user "civicrm"
   database_password database_password

+  fpm_prometheus_port 11301

 end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"
 end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"

-  repository "git://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"

 end
 
 wordpress_plugin "registration-honeypot" do
   site "join.osmfoundation.org"
 end
 
 end
 
 wordpress_plugin "registration-honeypot" do
   site "join.osmfoundation.org"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "contact-form-7" do

   site "join.osmfoundation.org"
   site "join.osmfoundation.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"

 end
 
 end
 

-wordpress_plugin "contact-form-7" do
+wordpress_plugin "civicrm-admin-utilities" do

   site "join.osmfoundation.org"
 end
 
   site "join.osmfoundation.org"
 end
 


@@ -66,43 +77,43 @@ civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm"
 directory "/opt/civicrm-#{civicrm_version}" do
   owner "wordpress"
   group "wordpress"
 directory "/opt/civicrm-#{civicrm_version}" do
   owner "wordpress"
   group "wordpress"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-remote_file "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
+remote_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do

   action :create_if_missing
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-wordpress.zip"
   owner "wordpress"
   group "wordpress"
   action :create_if_missing
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-wordpress.zip"
   owner "wordpress"
   group "wordpress"

-  mode 0o644
+  mode "644"

   backup false
 end
 
   backup false
 end
 

-remote_file "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do
+remote_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do

   action :create_if_missing
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-l10n.tar.gz"
   owner "wordpress"
   group "wordpress"
   action :create_if_missing
   source "https://download.civicrm.org/civicrm-#{civicrm_version}-l10n.tar.gz"
   owner "wordpress"
   group "wordpress"

-  mode 0o644
+  mode "644"

   backup false
 end
 
   backup false
 end
 

-execute "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do
+archive_file "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do

   action :nothing
   action :nothing

-  command "unzip -qq /var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip"
-  cwd "/opt/civicrm-#{civicrm_version}"
-  user "wordpress"
+  destination "/opt/civicrm-#{civicrm_version}"
+  overwrite true
+  owner "wordpress"

   group "wordpress"
   group "wordpress"

-  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :extract, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately

 end
 
 end
 

-execute "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do
+archive_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do

   action :nothing
   action :nothing

-  command "tar -zxf /var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz"
-  cwd "/opt/civicrm-#{civicrm_version}/civicrm"
-  user "wordpress"
+  destination "/opt/civicrm-#{civicrm_version}/civicrm"
+  overwrite true
+  owner "wordpress"

   group "wordpress"
   group "wordpress"

-  subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately
+  subscribes :extract, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately

 end
 
 execute "/opt/civicrm-#{civicrm_version}/civicrm" do
 end
 
 execute "/opt/civicrm-#{civicrm_version}/civicrm" do


@@ -110,14 +121,14 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do
   command "rsync --archive --delete /opt/civicrm-#{civicrm_version}/civicrm/ #{civicrm_directory}"
   user "wordpress"
   group "wordpress"
   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
+  subscribes :run, "archive_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :run, "archive_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately

 end
 
 end
 

-directory "/srv/join.osmfoundation.org/wp-content/plugins/files" do
+directory "/srv/join.osmfoundation.org/wp-content/uploads" do

   owner "www-data"
   group "www-data"
   owner "www-data"
   group "www-data"

-  mode 0o755
+  mode "755"

 end
 
 extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-extensions"
 end
 
 extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-extensions"


@@ -125,7 +136,7 @@ extensions_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm-e
 directory extensions_directory do
   owner "wordpress"
   group "wordpress"
 directory extensions_directory do
   owner "wordpress"
   group "wordpress"

-  mode 0o755
+  mode "755"

 end
 
 node[:civicrm][:extensions].each_value do |details|
 end
 
 node[:civicrm][:extensions].each_value do |details|


@@ -149,10 +160,12 @@ settings = edit_file "#{civicrm_directory}/civicrm/templates/CRM/common/civicrm.
   line.gsub!(/%%dbHost%%/, "localhost")
   line.gsub!(/%%dbName%%/, "civicrm")
   line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/")
   line.gsub!(/%%dbHost%%/, "localhost")
   line.gsub!(/%%dbName%%/, "civicrm")
   line.gsub!(/%%crmRoot%%/, "#{civicrm_directory}/civicrm/")

-  line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/plugins/files/civicrm/templates_c/")
+  line.gsub!(/%%templateCompileDir%%/, "/srv/join.osmfoundation.org/wp-content/uploads/civicrm/templates_c/")

   line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)
   line.gsub!(/%%baseURL%%/, "http://join.osmfoundation.org/")
   line.gsub!(/%%siteKey%%/, site_key)

-  line.gsub!(%r{// *(.*'ext_repo_url'.*)$}, "\\1")
+  line.gsub!(/%%credKeys%%/, cred_keys)
+  line.gsub!(/%%signKeys%%/, sign_keys)
+  line.gsub!(%r{// *define\('CIVICRM_CMSDIR', '/path/to/install/root/'\);}, "define('CIVICRM_CMSDIR', '/srv/join.osmfoundation.org');")

 
   line
 end
 
   line
 end


@@ -160,22 +173,34 @@ end
 file "#{civicrm_directory}/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"
 file "#{civicrm_directory}/civicrm.settings.php" do
   owner "wordpress"
   group "wordpress"

-  mode 0o644
+  mode "644"

   content settings
 end
 
   content settings
 end
 

-template "/etc/cron.d/osmf-crm" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o600
-  variables :directory => civicrm_directory, :passwords => passwords
+systemd_service "osmf-crm-jobs" do
+  description "Run CRM jobs"
+  exec_start "/usr/bin/php #{civicrm_directory}/civicrm/bin/cli.php -s join.osmfoundation.org -u batch -p \"#{passwords['batch']}\" -e Job -a execute"
+  user "www-data"
+  sandbox :enable_network => true
+  memory_deny_write_execute false
+  restrict_address_families "AF_UNIX"
+  read_write_paths "/srv/join.osmfoundation.org/wp-content/uploads/civicrm"
+end
+
+systemd_timer "osmf-crm-jobs" do
+  description "Run CRM jobs"
+  on_boot_sec "15m"
+  on_unit_inactive_sec "15m"
+end
+
+service "osmf-crm-jobs.timer" do
+  action [:enable, :start]

 end
 
 template "/etc/cron.daily/osmf-crm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/osmf-crm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o750
+  mode "750"

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end