convert tabs to 2 spaces

lorennorman · Jan 29, 2009 · 049446d · 049446d
1 parent 8f10931
commit 049446d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/lib/capistrano/ext/slicehost.rb b/lib/capistrano/ext/slicehost.rb
@@ -2,6 +2,6 @@
   abort "Requires Capistrano 2"
 end
 
-Dir["#{File.dirname(__FILE__)}/slicehost/*.rb"].each { |lib| 
-  Capistrano::Configuration.instance.load {load(lib)}   
+Dir["#{File.dirname(__FILE__)}/slicehost/*.rb"].each { |lib|
+  Capistrano::Configuration.instance.load {load(lib)}
 }
diff --git a/lib/capistrano/ext/slicehost/apache.rb b/lib/capistrano/ext/slicehost/apache.rb
@@ -81,7 +81,7 @@
     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"

diff --git a/lib/capistrano/ext/slicehost/aptitude.rb b/lib/capistrano/ext/slicehost/aptitude.rb
@@ -74,17 +74,17 @@
     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
+
+    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
-		language = ENV["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

diff --git a/lib/capistrano/ext/slicehost/disk.rb b/lib/capistrano/ext/slicehost/disk.rb
@@ -3,10 +3,10 @@
   task :free, :roles => :files do
     run "df -h /"
   end
-  
+
   desc "Show free memory"
   task :memory, :roles => :files do
     run "free -m"
   end
-  
+
 end
diff --git a/lib/capistrano/ext/slicehost/gems.rb b/lib/capistrano/ext/slicehost/gems.rb
@@ -21,7 +21,7 @@
   task :update, :roles => :app do
     sudo "gem update"
   end
-  
+
   desc "Update gem system on remote server"
   task :update_system, :roles => :app do
     sudo "gem update --system"

diff --git a/lib/capistrano/ext/slicehost/ssh.rb b/lib/capistrano/ext/slicehost/ssh.rb
@@ -32,13 +32,13 @@
     run "chown -R #{user}:#{user} ~/.ssh"
     run "chmod 700 ~/.ssh"
 
-    authorized_keys = ssh_options[:keys].collect { |key| 
-			begin
-				File.read("#{key}.pub")
-			rescue Errno::ENOENT => e
-			end
-			
-	  }.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