Skip to content

Commit

Permalink
Usage of "version" in redis configuration is failing, so remove it fo…
Browse files Browse the repository at this point in the history
…r now

Update some installation configuration so no exceptions are raised by the sprinkle config checker
  • Loading branch information
Andy Atkinson committed May 27, 2013
1 parent 12549e4 commit 77bbee3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
6 changes: 4 additions & 2 deletions install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
requires :database
requires :redis
requires :ruby
#requires :deploy
requires :deploy
end

deployment do
delivery :capistrano
delivery :capistrano do
recipes 'deploy'
end

source do
prefix '/usr/local'
Expand Down
2 changes: 1 addition & 1 deletion packages/build_essential.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package :build_essential do
describe 'Build tools'
description 'Build tools'
apt 'build-essential zlib1g-dev libssl-dev libreadline5-dev libcurl4-openssl-dev' do
pre :install, 'apt-get -y update',
'apt-get -y dist-upgrade'
Expand Down
7 changes: 4 additions & 3 deletions packages/redis.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package :redis do
description "Redis"
version "2.2.2"
source "http://redis.googlecode.com/files/redis-#{version}.tar.gz" do
version '2.2.2'
# TODO "version" not working
source "http://redis.googlecode.com/files/redis-2.2.2.tar.gz" do
conf = IO.read("assets/redis.conf")
custom_install "make && make install"
post :install, %{cp /usr/local/build/redis-#{version}/utils/redis_init_script /etc/init.d/redis}
post :install, %{cp /usr/local/build/redis-2.2.2/utils/redis_init_script /etc/init.d/redis}
post :install, %{chmod +x /etc/init.d/redis}
post :install, %{mkdir -p /var/redis}
post :install, %{update-rc.d redis defaults}
Expand Down

0 comments on commit 77bbee3

Please sign in to comment.