josh-slicehost 0.0.2.1 → 0.0.2.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Joshua Peek
+Copyright (c) 2009 Joshua Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -10,4 +10,13 @@ The recipes are designed to work stand alone apart from the standard set of Capi
 
   require 'capistrano/ext/slicehost' in your deploy.rb file
 
-Copyright (c) 2008 Joshua Peek, updated by Oleg Zhurbiy, released under the MIT license
+Contributors
+============
+
+* Oleg Zhurbiy
+* Thomas Balthazar
+* Fran Diéguez
+* Stephen Lumenta
+* Jared Giles
+
+Copyright (c) 2009 Joshua Peek, released under the MIT license

data/lib/capistrano/ext/slicehost/apache.rb

@@ -81,4 +81,9 @@ namespace :apache do
     put render("vhost", binding), application
     sudo "mv #{application} /etc/apache2/sites-available/#{application}"
   end
+  
+  desc "Install Apache"
+  task :install, :roles => :web do
+     sudo "aptitude install -y apache2 apache2.2-common apache2-mpm-prefork apache2-utils libexpat1 ssl-cert"
+  end
 end

data/lib/capistrano/ext/slicehost/aptitude.rb

@@ -74,14 +74,19 @@ namespace :aptitude do
     Updates software packages and creates "a solid base for the 'meat' of the \
     server". This task should be run only once when you are first setting up your \
     new slice.
+		
+		For set another language different from en_GB.UTF-8, just set the LANG \
+		environment	variable to your favorite language.
+		Ex. LANG="gl_ES.UTF-8"; cap aptitude:setup
 
     See "Update", "locales", "Upgrade" and "build essentials" sections on \
     http://articles.slicehost.com/2007/11/6/ubuntu-gutsy-setup-page-2
   DESC
   task :setup, :roles => :app do
     update
-    sudo "locale-gen en_GB.UTF-8"
-    sudo "/usr/sbin/update-locale LANG=en_GB.UTF-8"
+		language = ENV["LANG"] || "en_GB.UTF-8"
+    sudo "locale-gen language"
+    sudo "/usr/sbin/update-locale LANG=#{language}"
     safe_upgrade
     full_upgrade
     sudo "aptitude install -y build-essential"

data/lib/capistrano/ext/slicehost/disk.rb

@@ -3,4 +3,10 @@ namespace :disk do
   task :free, :roles => :files do
     run "df -h /"
   end
+  
+  desc "Show free memory"
+  task :memory, :roles => :files do
+    run "free -m"
+  end
+  
 end

data/lib/capistrano/ext/slicehost/gems.rb

@@ -1,4 +1,17 @@
 namespace :gems do
+  desc "Install the gem package system"
+  task :install_rubygems, :roles => :app do
+    rubygems_url = "http://rubyforge.org/" + Net::HTTP.get( URI.parse('http://rubyforge.org/frs/?group_id=126') ).scan(/frs\/.*\.tgz/).first.split('"')[0]
+    rubygems_version = rubygems_url[/(rubygems.*)(.tgz)/, 1]
+    run "test ! -f /usr/bin/gem"
+    run "wget -q #{rubygems_url}"
+    run "tar xzvf #{rubygems_version}.tgz"
+    run "rm #{rubygems_version}.tgz"
+    run "cd /home/#{user}/#{rubygems_version} && sudo /usr/bin/ruby ./setup.rb"
+    sudo "ln -s /usr/bin/gem1.8 /usr/bin/gem"
+    sudo "rm -rf #{rubygems_version}/"
+  end
+
   desc "List gems on remote server"
   task :list, :roles => :app do
     stream "gem list"
@@ -17,7 +30,7 @@ namespace :gems do
   desc "Install a gem on the remote server"
   task :install, :roles => :app do
     name = Capistrano::CLI.ui.ask("Which gem should we install: ")
-    sudo "gem install #{name}"
+    sudo "gem install #{name} --no-rdoc --no-ri"
   end
 
   desc "Uninstall a gem on the remote server"

data/lib/capistrano/ext/slicehost/ruby.rb

@@ -1,8 +1,12 @@
-# TODO: Automatically determine these values
-set :ruby_enterprise_version, "ruby-enterprise-1.8.6-20080810"
-set :passenger_version, "2.0.3"
+# TODO: Automatically determine this value
+set :passenger_version, "2.0.6"
+
+require 'net/http'
+set :ruby_enterprise_url ,Net::HTTP.get( 'www.rubyenterpriseedition.com', '/download.html' ).scan(/http:.*\.tar\.gz/).first
+set :ruby_enterprise_version, "#{ruby_enterprise_url[/(ruby-enterprise.*)(.tar.gz)/, 1]}"
 
 namespace :ruby do
+
   desc "Install Ruby 1.8"
   task :setup_18, :roles => :app do
     sudo "aptitude install -y ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8 libopenssl-ruby sqlite3 libsqlite3-ruby1.8"
@@ -15,8 +19,9 @@ namespace :ruby do
 
   desc "Install Ruby Enterpise Edition"
   task :install_enterprise, :roles => :app do
+    sudo "aptitude install -y libssl-dev"
     run "test ! -d /opt/#{ruby_enterprise_version}"
-    run "wget -q http://rubyforge.org/frs/download.php/41040/#{ruby_enterprise_version}.tar.gz"
+    run "wget -q #{ruby_enterprise_url}"
     run "tar xzvf #{ruby_enterprise_version}.tar.gz"
     run "rm #{ruby_enterprise_version}.tar.gz"
     sudo "./#{ruby_enterprise_version}/installer --auto /opt/#{ruby_enterprise_version}"
@@ -26,11 +31,21 @@ namespace :ruby do
   desc "Install Phusion Passenger"
   task :install_passenger, :roles => :app do
     sudo "apt-get install apache2-mpm-prefork"
-    sudo "/opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/gem install install passenger"
-    sudo "/opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/passenger-install-apache2-module"
+    sudo "aptitude install -y apache2-prefork-dev"
+    sudo "/opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/gem install passenger rake --no-rdoc --no-ri"
+    sudo "PATH='/opt/#{ruby_enterprise_version}/bin/':\$PATH /opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/passenger-install-apache2-module", :pty => true do |ch, stream, data|
+
+      if data =~ /Press\sEnter\sto\scontinue/ || data =~ /Press\sENTER\sto\scontinue/
+        # prompt, and then send the response to the remote process
+        ch.send_data(Capistrano::CLI.password_prompt("Press enter to continue: ") + "\n")
+      else
+        # use the default handler for all other text
+        Capistrano::Configuration.default_io_proc.call(ch, stream, data)
+       end
+    end
 
     put render("passenger.load", binding), "/home/#{user}/passenger.load"
-    put render("passenger.config", binding), "/home/#{user}/passenger.config"
+    put render("passenger.conf", binding), "/home/#{user}/passenger.conf"
 
     sudo "mv /home/#{user}/passenger.load /etc/apache2/mods-available/"
     sudo "mv /home/#{user}/passenger.config /etc/apache2/mods-available/"

data/lib/capistrano/ext/slicehost/ssh.rb

@@ -1,4 +1,4 @@
-ssh_options = { :keys => [File.expand_path("~/.ssh/id_dsa")], :port => 22 }
+ssh_options = { :keys => [File.expand_path("~/.ssh/id_dsa"),File.expand_path("~/.ssh/id_rsa") ], :port => 22 }
 
 namespace :ssh do
   desc <<-DESC
@@ -32,7 +32,13 @@ namespace :ssh do
     run "chown -R #{user}:#{user} ~/.ssh"
     run "chmod 700 ~/.ssh"
 
-    authorized_keys = ssh_options[:keys].collect { |key| File.read("#{key}.pub") }.join("\n")
+    authorized_keys = ssh_options[:keys].collect { |key| 
+			begin
+				File.read("#{key}.pub")
+			rescue Errno::ENOENT => e
+			end
+			
+	  }.join("\n")
     put authorized_keys, "./.ssh/authorized_keys", :mode => 0600
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josh-slicehost
 version: !ruby/object:Gem::Version 
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -07:00
+date: 2009-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ files:
 - lib/capistrano/ext/slicehost/iptables.rb
 - lib/capistrano/ext/slicehost/mysql.rb
 - lib/capistrano/ext/slicehost/templates
-- lib/capistrano/ext/slicehost/templates/passenger.config.erb
+- lib/capistrano/ext/slicehost/templates/passenger.conf.erb
 - lib/capistrano/ext/slicehost/templates/vhost.erb
 - lib/capistrano/ext/slicehost/templates/passenger.load.erb
 - lib/capistrano/ext/slicehost/templates/sshd_config.erb