From ebe0c76040e706c0fe73c8bc9673e486134f5d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 19 May 2015 11:08:41 +0200 Subject: [PATCH] Listen to unix socket in production by default --- config/defaults.yml | 2 +- config/diaspora.yml.example | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/defaults.yml b/config/defaults.yml index dcd103413..856319891 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -192,7 +192,7 @@ development: autofollow_on_join: false autofollow_on_join_user: '' production: - i_am_a_dummy: # Remove if you add an actual override + listen: 'unix:tmp/diaspora.sock' test: environment: url: 'http://localhost:9887/' diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index 6f5558fad..ba11d78e9 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -140,10 +140,10 @@ configuration: ## Section ## Settings affecting how ./script/server behaves. server: ## Section - ## Where the appserver should listen to (default=0.0.0.0:3000) - #listen: '127.0.0.1:3000' + ## Where the appserver should listen to (default=unix:tmp/diaspora.sock) #listen: 'unix:tmp/diaspora.sock' #listen: 'unix:/run/diaspora/diaspora.sock' + #listen: '127.0.0.1:3000' ## Rails environment (default='development'). ## The environment in which the server should be started by default.