typhoeus fixes and a few changes to the chef scripts

This commit is contained in:
maxwell 2010-12-07 18:05:15 -08:00 committed by Raphael Sofaer
parent 638311125f
commit bb5d5fc2c0
4 changed files with 17 additions and 5 deletions

View file

@ -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?

View file

@ -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

View file

@ -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

View file

@ -3,3 +3,4 @@ include_recipe "centos::mysql"
include_recipe "common::main"
include_recipe "centos::nginx"
include_recipe "centos::redis"
include_recipe "centos::curl"