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

Merge pull request #1090 from rjmooney/patch-1

Browse source 
Clarify the nginx configuration.
This commit is contained in:
Valeriy Sizov 2012-07-16 02:18:05 -07:00
parent e184df9ce7 491d674a96
commit 5265a88d75
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/installation.md
View file

@ -218,15 +218,15 @@ Application can be started with next command:
sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb
sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D
Edit /etc/nginx/nginx.conf. Add in **http** section: Edit /etc/nginx/nginx.conf. In the *http* section add:
upstream gitlab { upstream gitlab {
server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket; server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket;
} }
server { server {
listen YOUR_SERVER_IP:80; listen YOUR_SERVER_IP:80; # e.g., listen 192.168.1.1:80;
server_name gitlab.YOUR_DOMAIN.com; server_name YOUR_SERVER_FQDN; # e.g., server_name source.example.com;
root /home/gitlab/gitlab/public; root /home/gitlab/gitlab/public;
# individual nginx logs for this gitlab vhost # individual nginx logs for this gitlab vhost
@ -243,17 +243,17 @@ Edit /etc/nginx/nginx.conf. Add in **http** section:
# then the proxy pass the request to the upsteam (gitlab unicorn) # then the proxy pass the request to the upsteam (gitlab unicorn)
location @gitlab { location @gitlab {
proxy_redirect off; proxy_redirect off;
# you need to change this to "https", if you set "ssl" directive to "on" # you need to change this to "https", if you set "ssl" directive to "on"
proxy_set_header X-FORWARDED_PROTO http; proxy_set_header X-FORWARDED_PROTO http;
proxy_set_header Host gitlab.YOUR_SUBDOMAIN.com:80; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_pass http://gitlab; proxy_pass http://gitlab;
} }
} }
gitlab.YOUR_DOMAIN.com - change to your domain. Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN** to the IP address and fully-qualified domain name of the host serving GitLab.
Restart nginx: Restart nginx: