rakefile.rb in pauldowman-ec2onrails-0.9.10.2

- old
+ new

@@ -85,11 +85,11 @@
   "RubyInline",
   "memcache-client",
   "optiflag",
   "passenger",
   "rails",
-  "rails -v '~> 2.3.2'",
+  "rails -v '~> 2.3.3'",
   "rails -v '~> 2.2.2'",
   "rails -v '~> 2.1.2'",
   "rails -v '~> 2.0.5'",
   "rails -v '~> 1.2.6'",
   "rake",
@@ -132,15 +132,17 @@
 end
 
 desc "Install required ruby gems inside the image's filesystem"
 task :install_gems => [:require_root, :install_packages] do |t|
   unless_completed(t) do
-    url = "http://rubyforge.org/frs/download.php/56227/rubygems-1.3.3.tgz"
-    filename = "rubygems-1.3.3.tgz"
+    version = "1.3.5"
+    dir = "60718"
     
+    filename = "rubygems-#{version}.tgz"
+    url = "http://rubyforge.org/frs/download.php/#{dir}/#{filename}"
     run_chroot "sh -c 'cd /tmp && wget -q #{url} && tar zxf #{filename}'"
-    run_chroot "sh -c 'cd /tmp/rubygems-1.3.3 && ruby setup.rb'"
+    run_chroot "sh -c 'cd /tmp/rubygems-#{version} && ruby setup.rb'"
     run_chroot "ln -sf /usr/bin/gem1.8 /usr/bin/gem"
     #NOTE: this will update to the most recent rubygems version even if we haven't updated the url here
     run_chroot "gem update --system --no-rdoc --no-ri"
     run_chroot "gem update --no-rdoc --no-ri"
     run_chroot "gem sources -a http://gems.github.com"
@@ -202,10 +204,10 @@
     # Create symlinks to run scripts on startup
     run_chroot "update-rc.d ec2-first-startup start 91 S ."
     run_chroot "update-rc.d ec2-every-startup start 92 S ."
     
     # Disable the services that will be managed by god, depending on the roles
-    %w(nginx mysql memcached varnish).each do |service|
+    %w(nginx mysql memcached varnish varnishncsa).each do |service|
       run_chroot "update-rc.d -f #{service} remove"
       run_chroot "update-rc.d #{service} stop 20 2 3 4 5 ."
     end
     
     # God is started by upstart so that it will be restarted automatically if it dies,
\ No newline at end of file