X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cdd76b4b4526e93b801d15bf176beca450c91096..9949b7666e55675ff8e962fc7c44140b80b21125:/cookbooks/civicrm/recipes/default.rb diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 46c17d504..cadc73212 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -22,6 +22,8 @@ include_recipe "mysql" package "wkhtmltopdf" +cache_dir = Chef::Config[:file_cache_path] + passwords = data_bag_item("civicrm", "passwords") database_password = passwords["database"] @@ -69,7 +71,7 @@ directory "/opt/civicrm-#{civicrm_version}" do mode 0o755 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" @@ -78,7 +80,7 @@ remote_file "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do 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" @@ -87,22 +89,22 @@ remote_file "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do backup false end -execute "/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" do +execute "#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" do action :nothing - command "unzip -qq /var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip" + command "unzip -qq #{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip" cwd "/opt/civicrm-#{civicrm_version}" user "wordpress" group "wordpress" - subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-wordpress.zip]", :immediately + subscribes :run, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately end -execute "/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" do +execute "#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" do action :nothing - command "tar -zxf /var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz" + command "tar -zxf #{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz" cwd "/opt/civicrm-#{civicrm_version}/civicrm" user "wordpress" group "wordpress" - subscribes :run, "remote_file[/var/cache/chef/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately + subscribes :run, "remote_file[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately end execute "/opt/civicrm-#{civicrm_version}/civicrm" do @@ -110,8 +112,8 @@ execute "/opt/civicrm-#{civicrm_version}/civicrm" do 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, "execute[#{cache_dir}/civicrm-#{civicrm_version}-wordpress.zip]", :immediately + subscribes :run, "execute[#{cache_dir}/civicrm-#{civicrm_version}-l10n.tar.gz]", :immediately end directory "/srv/join.osmfoundation.org/wp-content/plugins/files" do