From a85333790f7f92e811672e01d5ea2ae3fe623769 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 18 Dec 2013 17:48:54 +1100
Subject: [PATCH] attempt to bypass setting port if socket is provided

---
 config/database.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index 94b772eb5..2fab24e56 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -43,7 +43,7 @@ production:
   uri: <%= uri = URI.parse(ENV['POSTGRES_URL'] ? ENV['POSTGRES_URL'] : "pg://localhost") %>
   socket: <%= ENV['POSTGRES_SOCKET'] %>
   host: <%= uri.host  %>
-  port: <%= uri.port || 5432 %>
+  port: <%= uri.port || (ENV['POSTGRES_SOCKET'] ? nil : 5432) %>
   database: <%= ENV['POSTGRES_DB'] || "discourse" %>
   username: <%= uri.user %>
   password: <%= uri.password %>