<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -80,7 +80,7 @@ namespace :deploy do
       sudo 'aptitude update'
       sudo 'aptitude install -y mysql-server libmysql-ruby1.8'
       password = HighLine.new.ask('Password for MySQL root user: ') { |q| q.echo = false }
-      run 'mysqladmin -uroot password #{password}'
+      run &quot;mysqladmin -uroot password \&quot;#{password}\&quot;&quot;
     end
     
     desc 'Install Postfix'
@@ -98,6 +98,13 @@ namespace :deploy do
       sudo &quot;ruby -e \&quot;d=File.read('/etc/network/interfaces'); exit if d =~ /iptables/; d.gsub!(/(iface lo inet loopback)(\\n)/, '\\1\\2pre-up iptables-restore &lt; /etc/iptables.up.rules\\2'); File.open('/etc/network/interfaces', 'w') { |f| f.write(d) }\&quot;&quot;
       puts 'Restart the server for the config to take effect.'
     end
+    
+    desc 'Install gem dependencies'
+    task :dependencies, :roles =&gt; :web do
+      sudo 'echo'
+      run &quot;cd #{release_path}; sudo rake gems:install&quot;
+    end
+    after 'deploy:update_code', 'deploy:install:dependencies'
 
   end
 end</diff>
      <filename>lib/recipes/install.rb</filename>
    </modified>
    <modified>
      <diff>@@ -22,13 +22,13 @@ namespace :deploy do
     
   end
   
-  task :after_setup do
-    run &quot;cd #{release_path}&quot;
-    sudo &quot;rake gems:install&quot;
-    run &quot;mysql -u root -e \&quot;create database onebody; grant all on onebody.* to onebody@localhost identified by '#{get_db_password}'\&quot;&quot;
+  task :create_database do
+    mysql_root_password = HighLine.new.ask('MySQL ROOT password: ') { |q| q.echo = false }
+    run &quot;mysql -uroot -p#{mysql_root_password} -e \&quot;create database onebody; grant all on onebody.* to onebody@localhost identified by '#{get_db_password}'\&quot;&quot;
     yml = render_erb_template(File.dirname(__FILE__) + '/templates/database.yml')
     put yml, &quot;#{shared_path}/config/database.yml&quot;
   end
+  after 'deploy:setup', 'deploy:create_database'
   
   task :after_update_code do
     rb = render_erb_template(File.dirname(__FILE__) + '/templates/links.rb')
@@ -36,5 +36,11 @@ namespace :deploy do
     run &quot;cp -r #{release_path}/public/* #{shared_path}/public/&quot;
     run &quot;ln -sf #{shared_path}/config/database.yml #{release_path}/config/database.yml&quot;
   end
+  
+  task :copy_ssh_key do
+    run &quot;mkdir -p ~/.ssh&quot;
+    pubkey = File.read(ENV['HOME'] + '/.ssh/id_rsa.pub')
+    run &quot;echo #{pubkey} &gt;&gt; ~/.ssh/authorized_keys&quot;
+  end
 
 end</diff>
      <filename>lib/recipes/setup.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>7c75f2a2ef84e8d25d9105134314a47bd0ef812e</id>
    </parent>
  </parents>
  <author>
    <name>Tim Morgan</name>
    <email>tim@timmorgan.org</email>
  </author>
  <url>http://github.com/seven1m/onebody/commit/3174e2e31ab5047f468349f9020ed877cb6ac767</url>
  <id>3174e2e31ab5047f468349f9020ed877cb6ac767</id>
  <committed-date>2008-08-18T21:52:13-07:00</committed-date>
  <authored-date>2008-08-18T21:52:13-07:00</authored-date>
  <message>Reorder tasks in cap recipe so that all dependencies are met.</message>
  <tree>78dbd17858308435bf04c0305631f079c6ba716a</tree>
  <committer>
    <name>Tim Morgan</name>
    <email>tim@timmorgan.org</email>
  </committer>
</commit>
