diff --git a/app/models/jobs/http_multi.rb b/app/models/jobs/http_multi.rb index 15dc3c171f416da9d2bc3dea71f7f12843d83a75..f30329d3b7369d970985ce3b5b8610d891ffd7e7 100644 --- a/app/models/jobs/http_multi.rb +++ b/app/models/jobs/http_multi.rb @@ -20,7 +20,7 @@ module Jobs url = person.receive_url xml = salmon.xml_for(person) - request = Typhoeus::Request.new(url, OPTS.merge(:xml => xml)) + request = Typhoeus::Request.new(url, OPTS.merge(:params => {:xml => xml})) request.on_complete do |response| unless response.success? diff --git a/chef/cookbooks/centos/recipes/bootstrap.rb b/chef/cookbooks/centos/recipes/bootstrap.rb index b992a8f013b3a5623a3df92b407b0684cd513c55..b5c86087665926fc65a22025eca12461951c82ab 100644 --- a/chef/cookbooks/centos/recipes/bootstrap.rb +++ b/chef/cookbooks/centos/recipes/bootstrap.rb @@ -18,10 +18,6 @@ execute "rvm deps" do command "yum install -y bzip2" end -execute "curl deps for Typheous" do - command "yum install -y curl.x86_64 curl-devel.x86_64" -end - def harden_ruby(ruby_string) Dir.glob("/usr/local/rvm/wrappers/#{ruby_string}/*").each do |file| link "/usr/local/bin/#{file.split('/').last}" do diff --git a/chef/cookbooks/centos/recipes/curl.rb b/chef/cookbooks/centos/recipes/curl.rb new file mode 100644 index 0000000000000000000000000000000000000000..d9e18565fc369a157b3e363b32f97354e384daa0 --- /dev/null +++ b/chef/cookbooks/centos/recipes/curl.rb @@ -0,0 +1,15 @@ +execute "download curl into usr/local" do + command "mkdir -p /usr/local && wget http://curl.haxx.se/download/curl-7.19.7.tar.gz" +end + +execute "configure, make, and install curl" do + command "cd /usr/local/curl-7.19.7 && tar -xvzf curl-7.19.7.tar.gz && ./configure && make && make install" +end + +execute 'add bundler line' do + command 'cd /usr/local/app/diaspora/ && bundle config build.typhoeus --with-curl=/usr/local/curl-7.19.7/' +end + +execute 'rebundle' do + command 'bundle install' +end diff --git a/chef/cookbooks/centos/recipes/main.rb b/chef/cookbooks/centos/recipes/main.rb index c7688a7e4d436c055d01e3612e08d367f2d25335..476b474718cd65fe6394f0dda18e837a7daf5106 100644 --- a/chef/cookbooks/centos/recipes/main.rb +++ b/chef/cookbooks/centos/recipes/main.rb @@ -3,3 +3,4 @@ include_recipe "centos::mysql" include_recipe "common::main" include_recipe "centos::nginx" include_recipe "centos::redis" +include_recipe "centos::curl"