Commit be5359c6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 00dc34e1 6ce00b73
...@@ -13,7 +13,7 @@ timeout 30 ...@@ -13,7 +13,7 @@ timeout 30
#listen 8080 # listen to port 8080 on all TCP interfaces #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 "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" pid "#{app_dir}/tmp/pids/unicorn.pid"
stderr_path "#{app_dir}/log/unicorn.stderr.log" stderr_path "#{app_dir}/log/unicorn.stderr.log"
......
...@@ -220,7 +220,7 @@ Application can be started with next command: ...@@ -220,7 +220,7 @@ Application can be started with next command:
Edit /etc/nginx/nginx.conf. Add next code to **http** section: Edit /etc/nginx/nginx.conf. Add next code to **http** section:
upstream gitlab { upstream gitlab {
server unix:/tmp/gitlab.socket; server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
} }
server { server {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment