From 2882d16e7a244d6627d9f6d9436651a38bf11bad Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 8 Jul 2013 07:55:16 +0300
Subject: [PATCH] cleanup puma config a bit

---
 config/puma.rb.example | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/config/puma.rb.example b/config/puma.rb.example
index ad5e3e23501..025ff7f3f05 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -8,47 +8,12 @@
 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
 
 application_path = '/home/git/gitlab'
-
-# The directory to operate out of.
-#
-# The default is the current directory.
-#
 directory application_path
-
-# Set the environment in which the rack's app will run.
-#
-# The default is “development”.
-#
 environment 'production'
-
-# Daemonize the server into the background. Highly suggest that
-# this be combined with “pidfile” and “stdout_redirect”.
-#
-# The default is “false”.
-#
 daemonize true
-
-# Store the pid of the server in the file at “path”.
-#
 pidfile "#{application_path}/tmp/pids/puma.pid"
-
-# Use “path” as the file to store the server info state. This is
-# used by “pumactl” to query and control the server.
-#
 state_path "#{application_path}/tmp/pids/puma.state"
-
-# Redirect STDOUT and STDERR to files specified. The 3rd parameter
-# (“append”) specifies whether the output is appended, the default is
-# “false”.
-#
 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-# stdout_redirect '/u/apps/lolcat/log/stdout', '/u/apps/lolcat/log/stderr', true
-
-# Disable request logging.
-#
-# The default is “false”.
-#
-# quiet
 
 # Configure “min” to be the minimum number of threads to use to answer
 # requests and “max” the maximum.
@@ -63,6 +28,9 @@ stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/
 # The default is “tcp://0.0.0.0:9292”.
 #
 # bind 'tcp://0.0.0.0:9292'
+# bind 'unix:///var/run/puma.sock'
+# bind 'unix:///var/run/puma.sock?umask=0777'
+# bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'
 bind "unix://#{application_path}/tmp/sockets/gitlab.socket"
 
 # Instead of “bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'” you