From d1e8b8282c205a13eb47922546c18f15ffdf685b Mon Sep 17 00:00:00 2001
From: Ben Schwarz <ben.schwarz@gmail.com>
Date: Wed, 31 Dec 2008 00:21:35 +1100
Subject: [PATCH] Changed installation verification for mysql and memcached to
 simply check 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.

---
 config/install.rb               |  1 +
 config/stack/memcached.rb       |  4 ++--
 config/stack/mysql.rb           |  2 +-
 config/stack/ruby_enterprise.rb | 11 +++++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/install.rb b/config/install.rb
index 805398a..d4351c9 100644
--- a/config/install.rb
+++ b/config/install.rb
@@ -9,6 +9,7 @@
   requires :webserver
   requires :scm 
   requires :memcached
+  requires :libmemcached
   requires :ruby_enterprise
 end
 
diff --git a/config/stack/memcached.rb b/config/stack/memcached.rb
index 22e74b9..1a19bd9 100644
--- a/config/stack/memcached.rb
+++ b/config/stack/memcached.rb
@@ -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
\ No newline at end of file
diff --git a/config/stack/mysql.rb b/config/stack/mysql.rb
index f7ea282..ef302ab 100644
--- a/config/stack/mysql.rb
+++ b/config/stack/mysql.rb
@@ -3,7 +3,7 @@
   apt %w( mysql-server mysql-client libmysqlclient15-dev )
   
   verify do
-    has_process 'mysql'
+    has_executable 'mysql'
   end
 end
  
diff --git a/config/stack/ruby_enterprise.rb b/config/stack/ruby_enterprise.rb
index 43d5fdb..c966b9a 100644
--- a/config/stack/ruby_enterprise.rb
+++ b/config/stack/ruby_enterprise.rb
@@ -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