nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make curl script more idempotent, make mysql run script use mysqld directly so it responds to -d

Browse source
This commit is contained in:
Raphael Sofaer 2011-02-23 14:43:03 -08:00
parent 2c5fc1bdd9
commit 69a98a2f5a
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chef/cookbooks/centos/recipes/curl.rb
View file

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

2
chef/cookbooks/common/recipes/daemontools.rb
View file

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