Merge branch 'gghs-0.2.9-7-14-stable' into '7-14-stable'

Use gitlab-git-http-server 0.2.9 in 7-14-stable

Nice to have on gitlab.com

See merge request !453

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

@@ -16,7 +16,7 @@
 #
 
 name "gitlab-git-http-server"
-default_version "c08b8fae49c41563aa7c7ad8a319841ad7e6be9a" # 0.2.8
+default_version "ffd46d3adeb1ebaf88eaedf4d4845834cfe8b385" # 0.2.9
 
 source :git => "https://gitlab.com/gitlab-org/gitlab-git-http-server.git"
 

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

@@ -321,6 +321,7 @@ 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"
 default['gitlab']['gitlab-git-http-server']['auth_backend'] = "http://localhost:8080"
+default['gitlab']['gitlab-git-http-server']['pprof_listen_addr'] = "''" # put an empty string on the command line
 default['gitlab']['gitlab-git-http-server']['dir'] = "/var/opt/gitlab/gitlab-git-http-server"
 default['gitlab']['gitlab-git-http-server']['log_dir'] = "/var/log/gitlab/gitlab-git-http-server"
 

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

@@ -18,4 +18,5 @@ 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'] %>