deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-02 00:25:01 +03:00
commit be5359c695
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/unicorn.rb.orig
View file

@ -13,7 +13,7 @@ timeout 30
#listen 8080 # listen to port 8080 on all TCP interfaces
#listen "127.0.0.1:8080" # listen to port 8080 on the loopback interface
listen "/tmp/gitlab.socket"
listen "#{app_dir}/tmp/sockets/gitlab.socket"
pid "#{app_dir}/tmp/pids/unicorn.pid"
stderr_path "#{app_dir}/log/unicorn.stderr.log"

2
doc/installation.md
View file

@ -220,7 +220,7 @@ Application can be started with next command:
Edit /etc/nginx/nginx.conf. Add next code to **http** section:
upstream gitlab {
server unix:/tmp/gitlab.socket;
server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
}
server {