From b55a99ec09cc48ef7ce97e466471aa275f272eee Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 17 Aug 2010 11:42:59 -0700
Subject: [PATCH] conf changes, kill nginx with go_cold

---
 config/sprinkle/conf/nginx.conf    | 3 ---
 config/sprinkle/packages/server.rb | 5 ++---
 config/sprinkle/provision.rb       | 1 +
 config/thin.yml                    | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index 3d8b9cb2a..d76534f37 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -28,9 +28,6 @@ http {
  # gzip_disable      "MSIE [1-6]\.(?!.*SV1)";
   upstream thin_cluster {
   server unix:/tmp/thin.0.sock;
-  server unix:/tmp/thin.1.sock;
-  server unix:/tmp/thin.2.sock;
-  server unix:/tmp/thin.3.sock;
   }
 
   server {
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index 0b9f416de..c553707b3 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -1,16 +1,15 @@
-package :nginx do
+package :nginx, :provides=> :webserver do
   description 'Nginx HTTP server'
   version '0.7.67'
   source "http://nginx.org/download/nginx-#{version}.tar.gz"
   requires :nginx_dependencies
 end
 
-package :nginx_conf, :provides=> :webserver do
+package :nginx_conf do
   description 'Nginx conf file'
   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
 end
 
 package :nginx_dependencies do
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index ec1c44c16..239f03fb2 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -17,6 +17,7 @@ policy :diaspora, :roles => [:pivots] do
   requires :webserver
   requires :scm
   requires :vim
+  requires :nginx_conf
 end
 
 
diff --git a/config/thin.yml b/config/thin.yml
index fa84529dd..564eef8d6 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -8,7 +8,7 @@ require: []
 
 max_persistent_conns: 512
 environment: production
-servers: 4
+servers: 1
 daemonize: true
 #chdir: /usr/applications/localhash/current
 socket: /tmp/thin.sock