Skip to content

Commit

Permalink
Changed installation verification for mysql and memcached to simply c…
Browse files Browse the repository at this point in the history
…heck for the respective executable binaries, this allows the user to tweak configuration on a per-slice basis and doesn't rely on a memcached or mysql process to be actually running.

Readded installation verification for ruby_enterprise.
Added libmemcached to the policy list rather than it sitting idle for no reason.
  • Loading branch information
benschwarz committed Dec 30, 2008
1 parent 104c323 commit d1e8b82
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions config/install.rb
Expand Up @@ -9,6 +9,7 @@
requires :webserver
requires :scm
requires :memcached
requires :libmemcached
requires :ruby_enterprise
end

Expand Down
4 changes: 2 additions & 2 deletions config/stack/memcached.rb
Expand Up @@ -5,11 +5,11 @@
post :install, "/etc/init.d/memcached start"

verify do
has_process "memcached"
has_executable 'memcached'
end
end

package :libmemcached do
source 'http://download.tangent.org/libmemcached-0.25.tar.gz'
requires :memcached
requires :memcached_daemon
end
2 changes: 1 addition & 1 deletion config/stack/mysql.rb
Expand Up @@ -3,7 +3,7 @@
apt %w( mysql-server mysql-client libmysqlclient15-dev )

verify do
has_process 'mysql'
has_executable 'mysql'
end
end

Expand Down
11 changes: 7 additions & 4 deletions config/stack/ruby_enterprise.rb
Expand Up @@ -19,12 +19,15 @@
%w(ruby gem rake rails).each do |bin|
post :install, "ln -s /opt/ruby-enterprise-#{version}/bin/#{bin} /usr/local/bin/"
end

# Symlink for other binaries
#post :install "sudo ln -s /opt/ruby-enterprise-#{version}/bin/ /usr/local/bin/RE-binaries"
end

# verify do
# has_directory "/opt/ruby-enterprise-#{version}"
# has_executable "/opt/ruby-enterprise-#{version}/bin/ruby"
# end
verify do
has_directory "/opt/ruby-enterprise-#{version}"
has_executable "/opt/ruby-enterprise-#{version}/bin/ruby"
end

requires :apache
requires :passenger
Expand Down

0 comments on commit d1e8b82

Please sign in to comment.