Download as
Browse Code »

Commit adccf87ea136a1992804455362ae88c56400806c

Authored by Jacob Vosmaer
1 parent 6b91be29
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

Move 'ha' attribute to unicorn

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @adccf87
@@ -39,7 +39,6 @@ default['gitlab']['user']['git_user_email'] = "gitlab@#{node['fqdn']}" @@ -39,7 +39,6 @@ default['gitlab']['user']['git_user_email'] = "gitlab@#{node['fqdn']}"
39 #### 39 ####
40 # GitLab Rails app 40 # GitLab Rails app
41 #### 41 ####
42 -default['gitlab']['gitlab-rails']['ha'] = false  
43 default['gitlab']['gitlab-rails']['dir'] = "/var/opt/gitlab/gitlab-rails" 42 default['gitlab']['gitlab-rails']['dir'] = "/var/opt/gitlab/gitlab-rails"
44 default['gitlab']['gitlab-rails']['log_directory'] = "/var/log/gitlab/gitlab-rails" 43 default['gitlab']['gitlab-rails']['log_directory'] = "/var/log/gitlab/gitlab-rails"
45 default['gitlab']['gitlab-rails']['environment'] = 'production' 44 default['gitlab']['gitlab-rails']['environment'] = 'production'
@@ -61,6 +60,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60 @@ -61,6 +60,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60
61 # Unicorn 60 # Unicorn
62 #### 61 ####
63 default['gitlab']['unicorn']['enable'] = true 62 default['gitlab']['unicorn']['enable'] = true
  63 +default['gitlab']['unicorn']['ha'] = false
64 default['gitlab']['unicorn']['log_directory'] = "/var/log/gitlab/unicorn" 64 default['gitlab']['unicorn']['log_directory'] = "/var/log/gitlab/unicorn"
65 default['gitlab']['unicorn']['worker_processes'] = 2 65 default['gitlab']['unicorn']['worker_processes'] = 2
66 default['gitlab']['unicorn']['listen'] = '127.0.0.1' 66 default['gitlab']['unicorn']['listen'] = '127.0.0.1'