diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index a6fcc2a3f..4063304d3 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -1,6 +1,6 @@
 
-worker_processes 4;
-pid /opt/nginx/sbin/nginx.pid;
+worker_processes 1;
+pid /tmp/pids/nginx.pid;
 
 events {
  worker_connections  8192;
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index 0d77c9cc6..99f326c8b 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -7,7 +7,7 @@ end
 
 package :nginx_conf, :provides=> :webserver do
   description 'Nginx conf file'
-  transfer "#{File.dirname(__FILE__)}/../conf/nginx.conf", '/usr/local/sbin/conf/nginx.conf', :render => true do
+  transfer "#{File.dirname(__FILE__)}/../conf/nginx.conf", '/usr/local/conf/nginx.conf', :render => true do
     pre :install, "mkdir -p /usr/local/sbin/conf/"
   end
   requires :nginx
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index 333c328cb..0ede8866d 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -35,11 +35,11 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 
 policy :diaspora, :roles => :app do
 #  requires :clean_dreamhost
-#  requires :tools
-#  requires :rubygems
-#	requires :bundler
-#  requires :diaspora_dependencies
-#  requires :database
+  requires :tools
+  requires :rubygems
+	requires :bundler
+  requires :diaspora_dependencies
+  requires :database
   requires :webserver
   requires :scm
 end