Download as
Browse Code »

Commit 85cf8df92af62171ae14838d8b5ad796d1fb1255

Authored by Jacob Vosmaer
1 parent cd690917
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Get Unicorn socket from attributes

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/nginx.rb
  Diff comments   View file @85cf8df
@@ -44,7 +44,8 @@ template nginx_vars[gitlab_http_config] do @@ -44,7 +44,8 @@ template nginx_vars[gitlab_http_config] do
44 mode "0644" 44 mode "0644"
45 variables(nginx_vars.merge( 45 variables(nginx_vars.merge(
46 { 46 {
47 - :fqdn => node['gitlab']['gitlab-rails']['external_fqdn'] 47 + :fqdn => node['gitlab']['gitlab-rails']['external_fqdn'],
  48 + :socket => node['gitlab']['unicorn']['socket']
48 } 49 }
49 )) 50 ))
50 notifies :restart, 'service[nginx]' if OmnibusHelper.should_notify?("nginx") 51 notifies :restart, 'service[nginx]' if OmnibusHelper.should_notify?("nginx")
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
  Diff comments   View file @85cf8df
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 # [2] https://github.com/agentzh/chunkin-nginx-module 16 # [2] https://github.com/agentzh/chunkin-nginx-module
17 17
18 upstream gitlab { 18 upstream gitlab {
19 - server unix:/home/git/gitlab/tmp/sockets/gitlab.socket; 19 + server unix:<%= @socket %>;
20 } 20 }
21 21
22 server { 22 server {