diff --git a/chef/cookbooks/centos/recipes/curl.rb b/chef/cookbooks/centos/recipes/curl.rb index d31488922..09ecd1b6a 100644 --- a/chef/cookbooks/centos/recipes/curl.rb +++ b/chef/cookbooks/centos/recipes/curl.rb @@ -1,7 +1,7 @@ curl = 'curl-7.21.4' execute 'download curl' do - command "mkdir -p /tmp/install && wget http://curl.download.nextag.com/download/#{curl}.tar.gz" + command "mkdir -p /tmp/install && cd /tmp/install/ && wget http://curl.download.nextag.com/download/#{curl}.tar.gz" not_if do File.exists?("/tmp/install/#{curl}.tar.gz") end @@ -16,17 +16,23 @@ end execute "configure curl" do command "cd /tmp/install/#{curl} && ./configure --with-ssl" - #not_if do - # the libcurl so file is there - #end + not_if do + File.exists?('/usr/local/lib/libcurl.so.4') + end end execute "compile curl" do command "cd /tmp/install/#{curl} && make" + not_if do + File.exists?('/usr/local/lib/libcurl.so.4') + end end execute "install curl" do command "cd /tmp/install/#{curl} && make install" + not_if do + File.exists?('/usr/local/lib/libcurl.so.4') + end end execute 'update dynamic loader cache for curl' do @@ -38,10 +44,6 @@ execute 'run dynamic linker' do command '/sbin/ldconfig' end -#execute 'add bundler line' do -# command "cd /usr/local/app/diaspora/ && bundle config build.typhoeus --with-curl=/usr/local/#{curl}/" -#end - -#execute 'rebundle' do -# command 'bundle install' -#end +execute 'rebundle' do + command 'bundle install' +end diff --git a/chef/cookbooks/common/recipes/daemontools.rb b/chef/cookbooks/common/recipes/daemontools.rb index c3af1cc51..5548ad10d 100644 --- a/chef/cookbooks/common/recipes/daemontools.rb +++ b/chef/cookbooks/common/recipes/daemontools.rb @@ -7,7 +7,7 @@ execute "compile daemontools" do end execute "mysql run" do - command "mkdir -p /service/mysql && echo '#!/bin/sh' > /service/mysql/run && echo 'exec /usr/bin/mysqld_safe --datadir=/var/lib/mysql --socket=/var/lib/mysql/mysql.sock --log-error=/var/log/mysqld.log --pid-file=/var/run/mysqld/mysqld.pid --user=mysql' >> /service/mysql/run" + command "mkdir -p /service/mysql && echo '#!/bin/sh' > /service/mysql/run && echo 'exec /usr/libexec/mysqld --datadir=/var/lib/mysql --socket=/var/lib/mysql/mysql.sock --log-error=/var/log/mysqld.log --pid-file=/var/run/mysqld/mysqld.pid --user=mysql' >> /service/mysql/run" end execute "executable" do command "chmod -R 755 /service/mysql"