Download as
Browse Code »

Commit be5359c695ae8f5583da1c5117e075d35e86c362

Authored by Dmitriy Zaporozhets
2 parents 00dc34e1 6ce00b73
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
config/unicorn.rb.orig
  Diff comments   View file @be5359c
... ... @@ -13,7 +13,7 @@ timeout 30
13 13  
14 14 #listen 8080 # listen to port 8080 on all TCP interfaces
15 15 #listen "127.0.0.1:8080" # listen to port 8080 on the loopback interface
16   -listen "/tmp/gitlab.socket"
  16 +listen "#{app_dir}/tmp/sockets/gitlab.socket"
17 17  
18 18 pid "#{app_dir}/tmp/pids/unicorn.pid"
19 19 stderr_path "#{app_dir}/log/unicorn.stderr.log"
... ...
doc/installation.md
  Diff comments   View file @be5359c
... ... @@ -220,7 +220,7 @@ Application can be started with next command:
220 220 Edit /etc/nginx/nginx.conf. Add next code to **http** section:
221 221  
222 222 upstream gitlab {
223   - server unix:/tmp/gitlab.socket;
  223 + server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
224 224 }
225 225  
226 226 server {
... ...