Merge branch 'master' of github.com:diaspora/diaspora_rails

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

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