Merge branch 'git-archive' into 'master'

Changes for gitlab-git-http-server 0.3.0

Handle "git archive" downloads in gitlab-git-http-server.

See merge request !515

config/software/gitlab-git-http-server.rb

@@ -16,7 +16,7 @@
 #
 
 name "gitlab-git-http-server"
-default_version "4523405e1e44e12e79726077a52dbf9219caf271" # 0.2.13
+default_version "bf2a3cedd9b631939330d2e54241f95a7b478763" # 0.3.0
 
 source :git => "https://gitlab.com/gitlab-org/gitlab-git-http-server.git"
 

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -341,7 +341,6 @@ default['gitlab']['web-server']['external_users'] = []
 
 default['gitlab']['gitlab-git-http-server']['enable'] = true
 default['gitlab']['gitlab-git-http-server']['ha'] = false
-default['gitlab']['gitlab-git-http-server']['repo_root'] = "/var/opt/gitlab/git-data/repositories"
 default['gitlab']['gitlab-git-http-server']['listen_network'] = "unix"
 default['gitlab']['gitlab-git-http-server']['listen_umask'] = 000
 default['gitlab']['gitlab-git-http-server']['listen_addr'] = "/var/opt/gitlab/gitlab-git-http-server/socket"

files/gitlab-cookbooks/gitlab/libraries/gitlab.rb

@@ -131,7 +131,6 @@ module Gitlab
       Gitlab['gitlab_shell']['git_data_directory'] ||= git_data_dir
       Gitlab['gitlab_rails']['gitlab_shell_repos_path'] ||= File.join(git_data_dir, "repositories")
       Gitlab['gitlab_rails']['satellites_path'] ||= File.join(git_data_dir, "gitlab-satellites")
-      Gitlab['gitlab_git_http_server']['repo_root'] ||= File.join(git_data_dir, "repositories")
     end
 
     def parse_udp_log_shipping

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb

@@ -149,7 +149,25 @@ server {
     proxy_pass http://gitlab;
   }
 
-  location ~ [-\/\w\.]+\.git\/ {
+  location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/api/v3/projects/.*/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location @gitlab-git-http-server {
     ## If you use HTTPS make sure you disable gzip compression
     ## to be safe against BREACH attack.
     <%= 'gzip off;' if @https %>

files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-git-http-server-run.erb

@@ -18,5 +18,4 @@ exec chpst -P \
       -listenUmask <%= node['gitlab']['gitlab-git-http-server']['listen_umask'] %> \
       -listenAddr <%= node['gitlab']['gitlab-git-http-server']['listen_addr'] %> \
       -authBackend <%= node['gitlab']['gitlab-git-http-server']['auth_backend'] %> \
-      -pprofListenAddr <%= node['gitlab']['gitlab-git-http-server']['pprof_listen_addr'] %> \
-      <%= node['gitlab']['gitlab-git-http-server']['repo_root'] %>
+      -pprofListenAddr <%= node['gitlab']['gitlab-git-http-server']['pprof_listen_addr'] %>