From: Benjamin Mako Hill <mako@atdot.cc>
Date: Mon, 6 Sep 2010 17:23:01 +0000 (-0400)
Subject: Merge remote branch 'remotes/deployment/master' into live
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/bd58ad9d8818dbfbf4a7de49c13eeadff1f43eef?hp=9e16ee781aefadbe9b1e92baa47fccf6be7a8405

Merge remote branch 'remotes/deployment/master' into live
---

diff --git a/config/mongrel_cluster.yml b/config/mongrel_cluster.yml
index 820c8e2..5f5efef 100644
--- a/config/mongrel_cluster.yml
+++ b/config/mongrel_cluster.yml
@@ -1,8 +1,8 @@
 --- 
-cwd: /org/selectricity/www/selectricity-live
+cwd: /org/selectricity/selectricity-live
 log_file: log/mongrel.log
 port: "8000"
 environment: production
-address: 127.0.0.1
+address: 18.181.1.87
 pid_file: tmp/pids/mongrel.pid
 servers: 3