Skip to content

Commit

Permalink
Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanwood committed Sep 11, 2011
1 parent 3b14aab commit e8c46b0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 22 deletions.
9 changes: 0 additions & 9 deletions config/deploy.rb.example

This file was deleted.

2 changes: 1 addition & 1 deletion config/stack/apache.rb
Expand Up @@ -19,7 +19,7 @@

package :passenger, :provides => :appserver do
description 'Phusion Passenger (mod_rails)'
version '2.2.4'
version '3.0.8'
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)

gem 'passenger', :version => version do
Expand Down
15 changes: 8 additions & 7 deletions config/stack/nginx.rb
Expand Up @@ -11,13 +11,13 @@
package :nginx, :provides => :webserver do
puts "** Nginx installed by passenger gem **"
requires :passenger

push_text File.read(File.join(File.dirname(__FILE__), 'nginx', 'init.d')), "/etc/init.d/nginx", :sudo => true do
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

verify do
has_executable "/usr/local/nginx/sbin/nginx"
has_file "/etc/init.d/nginx"
Expand All @@ -26,19 +26,20 @@

package :passenger, :provides => :appserver do
description 'Phusion Passenger (mod_rails)'
version '2.2.10'
version '3.0.8'
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)

gem 'passenger', :version => version do
pre :install, 'apt-get install libcurl4-openssl-dev'
# Install nginx and the module
binaries.each {|bin| post :install, "ln -s #{REE_PATH}/bin/#{bin} /usr/local/bin/#{bin}"}
post :install, "sudo passenger-install-nginx-module --auto --auto-download --prefix=/usr/local/nginx"
end

requires :ruby_enterprise

verify do
has_gem "passenger", version
binaries.each {|bin| has_symlink "/usr/local/bin/#{bin}", "#{REE_PATH}/bin/#{bin}" }
end
end
end
7 changes: 4 additions & 3 deletions config/stack/ruby_enterprise.rb
@@ -1,10 +1,11 @@
package :ruby_enterprise do
description 'Ruby Enterprise Edition'
version '1.8.7-2010.01'
version '1.8.7-2011.03'
REE_PATH = "/usr/local/ruby-enterprise"

binaries = %w(erb gem irb rackup rails rake rdoc ree-version ri ruby testrb)
source "http://rubyforge.org/frs/download.php/68719/ruby-enterprise-#{version}.tar.gz" do
# source "http://rubyforge.org/frs/download.php/68719/ruby-enterprise-#{version}.tar.gz" do
source "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-#{version}.tar.gz" do
custom_install 'sudo ./installer --auto=/usr/local/ruby-enterprise'
binaries.each {|bin| post :install, "ln -s #{REE_PATH}/bin/#{bin} /usr/local/bin/#{bin}" }
end
Expand All @@ -21,4 +22,4 @@
package :ree_dependencies do
apt %w(zlib1g-dev libreadline5-dev libssl-dev)
requires :build_essential
end
end
4 changes: 2 additions & 2 deletions config/stack/scm.rb
@@ -1,9 +1,9 @@
package :git, :provides => :scm do
description 'Git Distributed Version Control'
version '1.6.1'
version '1.7.6.1'
source "http://kernel.org/pub/software/scm/git/git-#{version}.tar.gz"
requires :git_dependencies

verify do
has_file '/usr/local/bin/git'
end
Expand Down

0 comments on commit e8c46b0

Please sign in to comment.