Download as
Browse Code »

Commit 2882d16e7a244d6627d9f6d9436651a38bf11bad

Authored by Dmitriy Zaporozhets
1 parent db11c1fd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

cleanup puma config a bit

Showing 1 changed file with 3 additions and 35 deletions   Show diff stats
config/puma.rb.example
  Diff comments   View file @2882d16
... ... @@ -8,47 +8,12 @@
8 8 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
9 9  
10 10 application_path = '/home/git/gitlab'
11   -
12   -# The directory to operate out of.
13   -#
14   -# The default is the current directory.
15   -#
16 11 directory application_path
17   -
18   -# Set the environment in which the rack's app will run.
19   -#
20   -# The default is “development”.
21   -#
22 12 environment 'production'
23   -
24   -# Daemonize the server into the background. Highly suggest that
25   -# this be combined with “pidfile” and “stdout_redirect”.
26   -#
27   -# The default is “false”.
28   -#
29 13 daemonize true
30   -
31   -# Store the pid of the server in the file at “path”.
32   -#
33 14 pidfile "#{application_path}/tmp/pids/puma.pid"
34   -
35   -# Use “path” as the file to store the server info state. This is
36   -# used by “pumactl” to query and control the server.
37   -#
38 15 state_path "#{application_path}/tmp/pids/puma.state"
39   -
40   -# Redirect STDOUT and STDERR to files specified. The 3rd parameter
41   -# (“append”) specifies whether the output is appended, the default is
42   -# “false”.
43   -#
44 16 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
45   -# stdout_redirect '/u/apps/lolcat/log/stdout', '/u/apps/lolcat/log/stderr', true
46   -
47   -# Disable request logging.
48   -#
49   -# The default is “false”.
50   -#
51   -# quiet
52 17  
53 18 # Configure “min” to be the minimum number of threads to use to answer
54 19 # requests and “max” the maximum.
... ... @@ -63,6 +28,9 @@ stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/
63 28 # The default is “tcp://0.0.0.0:9292”.
64 29 #
65 30 # bind 'tcp://0.0.0.0:9292'
  31 +# bind 'unix:///var/run/puma.sock'
  32 +# bind 'unix:///var/run/puma.sock?umask=0777'
  33 +# bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'
66 34 bind "unix://#{application_path}/tmp/sockets/gitlab.socket"
67 35  
68 36 # Instead of “bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'” you
... ...