Document IP ranges with comment

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

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index b0717ef540eb96abb441cba3dbc7efb15ea69397..a6c4494346f2ef7048660a1f5a83433f48742bf6 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -21,9 +21,12 @@ include_recipe "wordpress"
 include_recipe "mysql"
 
 package %w[
 include_recipe "mysql"
 
 package %w[

+  php-xml
+  php-curl

   rsync
   rsync

-  unzip

   wkhtmltopdf
   wkhtmltopdf

+  php-bcmath
+  php-intl

 ]
 
 cache_dir = Chef::Config[:file_cache_path]
 ]
 
 cache_dir = Chef::Config[:file_cache_path]


@@ -46,6 +49,7 @@ 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
 end
 
 wordpress_theme "osmblog-wp-theme" do


@@ -57,13 +61,11 @@ wordpress_plugin "registration-honeypot" do
   site "join.osmfoundation.org"
 end
 
   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 "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }

 end
 
 end
 

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

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


@@ -94,22 +96,22 @@ remote_file "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do
   backup false
 end
 
   backup false
 end
 

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

   action :nothing
   action :nothing

-  command "unzip -o -qq #{cache_dir}/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[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
+  subscribes :extract, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately

 end
 
 end
 

-execute "#{cache_dir}/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 #{cache_dir}/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[#{cache_dir}/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


@@ -117,8 +119,8 @@ 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[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately
-  subscribes :run, "execute[#{cache_dir}/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
 
 directory "/srv/join.osmfoundation.org/wp-content/uploads" do
 end
 
 directory "/srv/join.osmfoundation.org/wp-content/uploads" do