From 41e6fc31a3df0051603cf2faf813cc3b2a0244c1 Mon Sep 17 00:00:00 2001
From: root <root@ContinuousIntegration.(none)>
Date: Mon, 9 Aug 2010 03:11:32 +0000
Subject: [PATCH] final sprinkle change

---
 config/sprinkle/packages/scm.rb |  8 ++++----
 config/sprinkle/provision.rb    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 7ed5a242a..b97b2833c 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -7,15 +7,15 @@ end
 
 package :privkey do
   description 'checkout from github with it'
-  transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa", '/root/.ssh/id_rsa', :render => false
+  transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa", '/root/.ssh/id_rsa', :render => false do 
+    pre :install, "rm -rf /root/.ssh/ && mkdir -p /root/.ssh/"
+  end
 end
 
 package :pubkey do
-  transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa.pub", '/root/.ssh/id_rsa.pub', :render => false  do 
-    pre :install, "mkdir -p /root/.ssh/"
+  transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa.pub", '/root/.ssh/id_rsa.pub', :render => false  
   requires :privkey
   requires :known_hosts
-  end
 end
 
 package :known_hosts do
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index c0ed8636b..055152545 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -36,11 +36,11 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 policy :diaspora, :roles => [:tom, :backer] do
 #  requires :clean_dreamhost
 #  requires :tools
-  #requires :rubygems
-	#requires :bundler
-  #requires :diaspora_dependencies
-  #requires :database
-  #requires :webserver
+  requires :rubygems
+	requires :bundler
+  requires :diaspora_dependencies
+  requires :database
+  requires :webserver
   requires :scm
   requires :vim
 end