From 9dd72123fc4379856a2bf662e00019c57faf8e42 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Thu, 17 Jun 2010 16:24:02 -0700
Subject: [PATCH] deleted confusing deploy.rb

---
 config/sprinkle/deploy.rb   | 40 -------------------------------------
 config/sprinkle/diaspora.rb |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 config/sprinkle/deploy.rb

diff --git a/config/sprinkle/deploy.rb b/config/sprinkle/deploy.rb
deleted file mode 100644
index 492faa073..000000000
--- a/config/sprinkle/deploy.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-set :user, 'diasporaroot'
-set :scm_passphrase, "evankorth311"
-
-role :app, 'ps25770.dreamhost.com', :primary => true
-# Source code
-set :scm, :git
-set :repository, "git://github.com:rsofaer/roxml.git"
-set :branch, "master"
-#set :repository_cache, "git_cache"
-#set :deploy_via, :remote_cache
-#set :ssh_options, { :forward_agent => true }
-
-set :deploy_to, "/usr/local/diaspora"
-
-namespace :bundler do
-  task :create_symlink, :roles => :app do
-    shared_dir = File.join(shared_path, 'bundle')
-    release_dir = File.join(current_release, '.bundle')
-    run("mkdir -p #{shared_dir} && ln -s #{shared_dir} #{release_dir}")
-  end
-  
-  task :bundle_new_release, :roles => :app do
-    bundler.create_symlink
-    run "cd #{release_path} && bundle install --without test"
-  end
-  
-  task :lock, :roles => :app do
-    run "cd #{current_release} && bundle lock;"
-  end
-  
-  task :unlock, :roles => :app do
-    run "cd #{current_release} && bundle unlock;"
-  end
-end
-
-# HOOKS
-after "deploy:update_code" do
-  bundler.bundle_new_release
-  # ...
-end
diff --git a/config/sprinkle/diaspora.rb b/config/sprinkle/diaspora.rb
index 4d2d12e21..5f774ed7a 100755
--- a/config/sprinkle/diaspora.rb
+++ b/config/sprinkle/diaspora.rb
@@ -57,7 +57,7 @@ deployment do
 
   # mechanism for deployment
   delivery :capistrano do
-    recipes 'deploy'
+    recipes './../deploy'
   end
 
   # source based package installer defaults