Commit be5359c695ae8f5583da1c5117e075d35e86c362
Exists in
master
and in
4 other branches
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
| @@ -13,7 +13,7 @@ timeout 30 | @@ -13,7 +13,7 @@ timeout 30 | ||
| 13 | 13 | ||
| 14 | #listen 8080 # listen to port 8080 on all TCP interfaces | 14 | #listen 8080 # listen to port 8080 on all TCP interfaces |
| 15 | #listen "127.0.0.1:8080" # listen to port 8080 on the loopback interface | 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 | pid "#{app_dir}/tmp/pids/unicorn.pid" | 18 | pid "#{app_dir}/tmp/pids/unicorn.pid" |
| 19 | stderr_path "#{app_dir}/log/unicorn.stderr.log" | 19 | stderr_path "#{app_dir}/log/unicorn.stderr.log" |
doc/installation.md
| @@ -220,7 +220,7 @@ Application can be started with next command: | @@ -220,7 +220,7 @@ Application can be started with next command: | ||
| 220 | Edit /etc/nginx/nginx.conf. Add next code to **http** section: | 220 | Edit /etc/nginx/nginx.conf. Add next code to **http** section: |
| 221 | 221 | ||
| 222 | upstream gitlab { | 222 | upstream gitlab { |
| 223 | - server unix:/tmp/gitlab.socket; | 223 | + server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | server { | 226 | server { |