Replace grack with gitlab-git-http-server

2 files changed, 42 insertions, 46 deletions

diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index efa0898900f..17f89c8beb6 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -38,10 +38,9 @@ upstream gitlab {
   server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
 }
 
-## Experimental: gitlab-git-http-server
-# upstream gitlab-git-http-server {
-#   server localhost:8181;
-# }
+upstream gitlab-git-http-server {
+  server unix:/home/git/gitlab/tmp/sockets/gitlab-git-http-server.socket fail_timeout=0;
+}
 
 ## Normal HTTP host
 server {
@@ -114,25 +113,24 @@ server {
     proxy_pass http://gitlab;
   }
 
-  ## Experimental: send Git HTTP traffic to gitlab-git-http-server instead of Unicorn
-  # location ~ [-\/\w\.]+\.git\/ {
-  #   ## If you use HTTPS make sure you disable gzip compression
-  #   ## to be safe against BREACH attack.
-  #   # gzip off;
-
-  #   ## https://github.com/gitlabhq/gitlabhq/issues/694
-  #   ## Some requests take more than 30 seconds.
-  #   proxy_read_timeout      300;
-  #   proxy_connect_timeout   300;
-  #   proxy_redirect          off;
-
-  #   proxy_set_header    Host                $http_host;
-  #   proxy_set_header    X-Real-IP           $remote_addr;
-  #   proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-  #   proxy_set_header    X-Forwarded-Proto   $scheme;
-
-  #   proxy_pass http://gitlab-git-http-server;
-  # }
+  location ~ [-\/\w\.]+\.git\/ {
+    ## If you use HTTPS make sure you disable gzip compression
+    ## to be safe against BREACH attack.
+    # gzip off;
+
+    ## https://github.com/gitlabhq/gitlabhq/issues/694
+    ## Some requests take more than 30 seconds.
+    proxy_read_timeout      300;
+    proxy_connect_timeout   300;
+    proxy_redirect          off;
+
+    proxy_set_header    Host                $http_host;
+    proxy_set_header    X-Real-IP           $remote_addr;
+    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+    proxy_set_header    X-Forwarded-Proto   $scheme;
+
+    proxy_pass http://gitlab-git-http-server;
+  }
 
   ## Enable gzip compression as per rails guide:
   ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 314525518f1..5ba39fc41a4 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -42,10 +42,9 @@ upstream gitlab {
   server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
 }
 
-## Experimental: gitlab-git-http-server
-# upstream gitlab-git-http-server {
-#   server localhost:8181;
-# }
+upstream gitlab-git-http-server {
+  server unix:/home/git/gitlab/tmp/sockets/gitlab-git-http-server.socket fail_timeout=0;
+}
 
 ## Redirects all HTTP traffic to the HTTPS host
 server {
@@ -161,25 +160,24 @@ server {
     proxy_pass http://gitlab;
   }
 
-  ## Experimental: send Git HTTP traffic to gitlab-git-http-server instead of Unicorn
-  # location ~ [-\/\w\.]+\.git\/ {
-  #   ## If you use HTTPS make sure you disable gzip compression
-  #   ## to be safe against BREACH attack.
-  #   gzip off;
-
-  #   ## https://github.com/gitlabhq/gitlabhq/issues/694
-  #   ## Some requests take more than 30 seconds.
-  #   proxy_read_timeout      300;
-  #   proxy_connect_timeout   300;
-  #   proxy_redirect          off;
-
-  #   proxy_set_header    Host                $http_host;
-  #   proxy_set_header    X-Real-IP           $remote_addr;
-  #   proxy_set_header    X-Forwarded-Ssl     on;
-  #   proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-  #   proxy_set_header    X-Forwarded-Proto   $scheme;
-  #   proxy_pass http://gitlab-git-http-server;
-  # }
+  location ~ [-\/\w\.]+\.git\/ {
+    ## If you use HTTPS make sure you disable gzip compression
+    ## to be safe against BREACH attack.
+    gzip off;
+
+    ## https://github.com/gitlabhq/gitlabhq/issues/694
+    ## Some requests take more than 30 seconds.
+    proxy_read_timeout      300;
+    proxy_connect_timeout   300;
+    proxy_redirect          off;
+
+    proxy_set_header    Host                $http_host;
+    proxy_set_header    X-Real-IP           $remote_addr;
+    proxy_set_header    X-Forwarded-Ssl     on;
+    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+    proxy_set_header    X-Forwarded-Proto   $scheme;
+    proxy_pass http://gitlab-git-http-server;
+  }
 
   ## Enable gzip compression as per rails guide:
   ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression