From 61ffda6bf465105b92a7b1678a073ef4c51dc1ad Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Fri, 23 Jul 2010 11:05:29 -0700
Subject: [PATCH 1/2] re-enabling sprinkle script

---
 config/sprinkle/provision.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index 2223de3d4..ef01df209 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -35,13 +35,13 @@ 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 :scm
+  requires :tools
+  requires :rubygems
+	requires :bundler
+  requires :diaspora_dependencies
+  requires :database
+  requires :webserver
+  requires :scm
   requires :vim
 end
 =begin

From 473662a2657619dedf99deca6a31fc9bc19c6533 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Fri, 23 Jul 2010 11:50:14 -0700
Subject: [PATCH 2/2] Layout false on hubub controller

---
 app/controllers/publics_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 073bdee50..024a7df40 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -20,7 +20,7 @@ class PublicsController < ApplicationController
   
   def hubbub
       if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe'
-        render :text => params['hub.challenge'], :status => 202 
+        render :text => params['hub.challenge'], :status => 202, :layout => false 
       else 
         Diaspora::OStatusParser::process(request.body.read)
       end