Download as
Browse Code »

Commit a273a299df0972acdd5abfbae38709864d930e9d

Authored by Jacob Vosmaer
1 parent 85a6fe3a
Exists in master and in 13 other branches 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

Expose ActiveRecord socket setting in attributes

Showing 2 changed files with 2 additions and 0 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @a273a29
@@ -108,6 +108,7 @@ default['gitlab']['gitlab-rails']['db_username'] = "gitlab" @@ -108,6 +108,7 @@ default['gitlab']['gitlab-rails']['db_username'] = "gitlab"
108 default['gitlab']['gitlab-rails']['db_password'] = "password" 108 default['gitlab']['gitlab-rails']['db_password'] = "password"
109 default['gitlab']['gitlab-rails']['db_host'] = "localhost" 109 default['gitlab']['gitlab-rails']['db_host'] = "localhost"
110 default['gitlab']['gitlab-rails']['db_port'] = 6379 110 default['gitlab']['gitlab-rails']['db_port'] = 6379
  111 +default['gitlab']['gitlab-rails']['db_socket'] = nil
111 112
112 #### 113 ####
113 # Unicorn 114 # Unicorn
files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
  Diff comments   View file @a273a29
@@ -7,3 +7,4 @@ production: @@ -7,3 +7,4 @@ production:
7 password: "<%= @db_password %>" 7 password: "<%= @db_password %>"
8 host: <%= @db_host %> 8 host: <%= @db_host %>
9 port: <%= @db_port %> 9 port: <%= @db_port %>
  10 + socket: <%= @db_socket %>