Commit 0718d877 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge pull request #7578 from bbodenmiller/patch-8

Unify Nginx files to match as closely as possible
parents 9bdd30f4 3663354c
# GITLAB ## GitLab
# Maintainer: @randx ## Maintainer: @randx
##
# CHUNKED TRANSFER ## Lines starting with two hashes (##) are comments with information.
# It is a known issue that Git-over-HTTP requires chunked transfer encoding [0] which is not ## Lines starting with one hash (#) are configuration parameters that can be uncommented.
# supported by Nginx < 1.3.9 [1]. As a result, pushing a large object with Git (i.e. a single large file) ##
# can lead to a 411 error. In theory you can get around this by tweaking this configuration file and either ##################################
# - installing an old version of Nginx with the chunkin module [2] compiled in, or ## CHUNKED TRANSFER ##
# - using a newer version of Nginx. ##################################
# ##
# At the time of writing we do not know if either of these theoretical solutions works. As a workaround ## It is a known issue that Git-over-HTTP requires chunked transfer encoding [0]
# users can use Git over SSH to push large files. ## which is not supported by Nginx < 1.3.9 [1]. As a result, pushing a large object
# ## with Git (i.e. a single large file) can lead to a 411 error. In theory you can get
# [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99 ## around this by tweaking this configuration file and either:
# [1] https://github.com/agentzh/chunkin-nginx-module#status ## - installing an old version of Nginx with the chunkin module [2] compiled in, or
# [2] https://github.com/agentzh/chunkin-nginx-module ## - using a newer version of Nginx.
##
## At the time of writing we do not know if either of these theoretical solutions works.
## As a workaround users can use Git over SSH to push large files.
##
## [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99
## [1] https://github.com/agentzh/chunkin-nginx-module#status
## [2] https://github.com/agentzh/chunkin-nginx-module
##
###################################
## configuration ##
###################################
##
upstream gitlab { upstream gitlab {
server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
} }
## Normal HTTP host
server { server {
listen *:80 default_server; listen *:80 default_server;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
server_tokens off; ## Don't show the nginx version number, a security best practice server_tokens off; ## Don't show the nginx version number, a security best practice
root /home/git/gitlab/public; root /home/git/gitlab/public;
# Increase this if you want to upload large attachments ## Increase this if you want to upload large attachments
# Or if you want to accept large git objects over http ## Or if you want to accept large git objects over http
client_max_body_size 20m; client_max_body_size 20m;
# individual nginx logs for this gitlab vhost ## Individual nginx logs for this GitLab vhost
access_log /var/log/nginx/gitlab_access.log; access_log /var/log/nginx/gitlab_access.log;
error_log /var/log/nginx/gitlab_error.log; error_log /var/log/nginx/gitlab_error.log;
location / { location / {
# serve static files from defined root folder;. ## Serve static files from defined root folder.
# @gitlab is a named location for the upstream fallback, see below ## @gitlab is a named location for the upstream fallback, see below.
try_files $uri $uri/index.html $uri.html @gitlab; try_files $uri $uri/index.html $uri.html @gitlab;
} }
# if a file, which is not found in the root folder is requested, ## If a file, which is not found in the root folder is requested,
# then the proxy pass the request to the upsteam (gitlab unicorn) ## then the proxy passes the request to the upsteam (gitlab unicorn).
location @gitlab { location @gitlab {
# If you use https make sure you disable gzip compression ## If you use HTTPS make sure you disable gzip compression
# to be safe against BREACH attack ## to be safe against BREACH attack.
# gzip off; # gzip off;
proxy_read_timeout 300; # Some requests take more than 30 seconds. ## https://github.com/gitlabhq/gitlabhq/issues/694
proxy_connect_timeout 300; # Some requests take more than 30 seconds. ## Some requests take more than 30 seconds.
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_redirect off; proxy_redirect off;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Frame-Options SAMEORIGIN; proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_pass http://gitlab; proxy_pass http://gitlab;
} }
# Enable gzip compression as per rails guide: http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression ## Enable gzip compression as per rails guide:
# WARNING: If you are using relative urls do remove the block below ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
# See config/application.rb under "Relative url support" for the list of ## WARNING: If you are using relative urls remove the block below
# other files that need to be changed for relative url support ## See config/application.rb under "Relative url support" for the list of
## other files that need to be changed for relative url support
location ~ ^/(assets)/ { location ~ ^/(assets)/ {
root /home/git/gitlab/public; root /home/git/gitlab/public;
gzip_static on; # to serve pre-gzipped version gzip_static on; # to serve pre-gzipped version
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
## - installing an old version of Nginx with the chunkin module [2] compiled in, or ## - installing an old version of Nginx with the chunkin module [2] compiled in, or
## - using a newer version of Nginx. ## - using a newer version of Nginx.
## ##
## At the time of writing we do not know if either of these theoretical solutions works. As a workaround ## At the time of writing we do not know if either of these theoretical solutions works.
## users can use Git over SSH to push large files. ## As a workaround users can use Git over SSH to push large files.
## ##
## [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99 ## [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99
## [1] https://github.com/agentzh/chunkin-nginx-module#status ## [1] https://github.com/agentzh/chunkin-nginx-module#status
...@@ -48,15 +48,18 @@ upstream gitlab { ...@@ -48,15 +48,18 @@ upstream gitlab {
server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;
} }
## This is a normal HTTP host which redirects all traffic to the HTTPS host. ## Normal HTTP host
server { server {
listen *:80 default_server; listen *:80 default_server;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
server_tokens off; ## Don't show the nginx version number, a security best practice server_tokens off; ## Don't show the nginx version number, a security best practice
## Redirects all traffic to the HTTPS host
root /nowhere; ## root doesn't have to be a valid path since we are redirecting root /nowhere; ## root doesn't have to be a valid path since we are redirecting
rewrite ^ https://$server_name$request_uri permanent; rewrite ^ https://$server_name$request_uri permanent;
} }
## HTTPS host
server { server {
listen 443 ssl; listen 443 ssl;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
...@@ -95,10 +98,9 @@ server { ...@@ -95,10 +98,9 @@ server {
} }
## If a file, which is not found in the root folder is requested, ## If a file, which is not found in the root folder is requested,
## then the proxy pass the request to the upsteam (gitlab unicorn). ## then the proxy passes the request to the upsteam (gitlab unicorn).
location @gitlab { location @gitlab {
## If you use HTTPS make sure you disable gzip compression
## If you use https make sure you disable gzip compression
## to be safe against BREACH attack. ## to be safe against BREACH attack.
gzip off; gzip off;
...@@ -120,7 +122,7 @@ server { ...@@ -120,7 +122,7 @@ server {
## Enable gzip compression as per rails guide: ## Enable gzip compression as per rails guide:
## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
## WARNING: If you are using relative urls do remove the block below ## WARNING: If you are using relative urls remove the block below
## See config/application.rb under "Relative url support" for the list of ## See config/application.rb under "Relative url support" for the list of
## other files that need to be changed for relative url support ## other files that need to be changed for relative url support
location ~ ^/(assets)/ { location ~ ^/(assets)/ {
......
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