Added installer notes. Moved passenger-binaries into their own "packa…

…ge" for modularity

config/stack/apache.rb

@@ -46,6 +46,7 @@
   end
 
   requires :apache, :apache2_prefork_dev, :ruby_enterprise
+  recommends :passenger_binaries
 end
 
 # These "installers" are strictly optional, I believe

config/stack/nginx.rb

@@ -3,8 +3,8 @@
 # =========
 
 # The phusion guys have made it so that you can install nginx and passenger in one 
-# fell swoop, it is for this reason and cleanlyness that I haven't decided to install
-# nginx and passenger seperatly, otherwise nginx ends up being dependent on passenger
+# fell swoop, it is for this reason and cleanliness that I haven't decided to install
+# nginx and passenger separately, otherwise nginx ends up being dependent on passenger
 # so that it can call --add-module within its configure statement - That in itself would
 # be strange. 
 
@@ -14,9 +14,27 @@
 
 package :passenger, :provides => :appserver do
   description 'Phusion Passenger (mod_rails)'
-  version '2.2.1'
+  version '2.2.3'
 
   gem 'passenger', :version => version do
+    # Install nginx and the module
     post :install, "sudo passenger-install-nginx-module --auto --auto-download --prefix=/usr/local/nginx"
+
+    post :install do
+      # Install nginx init.d script
+      #push_text File.read(File.join(File.dirname(__FILE__), 'nginx', 'init.d')), "/etc/init.d/nginx", :sudo => true
+    end
+
+    #post :install, "sudo chmod +x /etc/init.d/nginx"
+    #post :install, "sudo /usr/sbin/update-rc.d -f nginx defaults"
+    #post :install, "sudo /etc/init.d/nginx start"
   end
+
+  requires :ruby_enterprise
+  recommends :passenger_binaries
+
+  #verify do
+  #  has_executable "/usr/local/nginx/sbin/nginx"
+  #  has_gem "passenger", version
+  #end
 end

config/stack/ruby_enterprise.rb

@@ -3,8 +3,8 @@
   version '1.8.6-20090421'
 
   install_path = "/usr/local/ruby-enterprise"
-  binaries = %w(erb gem irb passenger-config passenger-install-nginx-module passenger-install-apache2-module passenger-make-enterprisey passenger-memory-stats passenger-spawn-server passenger-status passenger-stress-test rackup rails rake rdoc ree-version ri ruby testrb)
-  source "http://rubyforge.org/frs/download.php/51100/ruby-enterprise-#{version}.tar.gz" do
+  binaries = %w(erb gem irb rackup rails rake rdoc ree-version ri ruby testrb)
+  source "http://rubyforge.org/frs/download.php/55511/ruby-enterprise-#{version}.tar.gz" do
     custom_install 'sudo ./installer --auto=/usr/local/ruby-enterprise'
 
     binaries.each {|bin| post :install, "ln -s #{install_path}/bin/#{bin} /usr/local/bin/#{bin}" }
@@ -21,4 +21,16 @@
 
 package :ree_dependencies do 
   apt %w(zlib1g-dev libreadline5-dev libssl-dev)
-end
+  # requires :build_essential
+end
+
+package :passenger_binaries do
+  description "Symlinks passenger binaries"
+  binaries = %w(passenger-config passenger-install-nginx-module passenger-install-apache2-module passenger-make-enterprisey passenger-memory-stats passenger-spawn-server passenger-status passenger-stress-test)
+  install_path = "/usr/local/ruby-enterprise"
+  binaries.each {|bin| post :install, "ln -s #{install_path}/bin/#{bin} /usr/local/bin/#{bin}" }
+
+  verify do
+    binaries.each {|bin| has_symlink "/usr/local/bin/#{bin}", "#{install_path}/bin/#{bin}" }
+  end
+end