From a273a299df0972acdd5abfbae38709864d930e9d Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 18 Mar 2014 12:07:07 +0100 Subject: [PATCH] Expose ActiveRecord socket setting in attributes --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 1 + files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 0ab65c8..35e3f3f 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -108,6 +108,7 @@ default['gitlab']['gitlab-rails']['db_username'] = "gitlab" default['gitlab']['gitlab-rails']['db_password'] = "password" default['gitlab']['gitlab-rails']['db_host'] = "localhost" default['gitlab']['gitlab-rails']['db_port'] = 6379 +default['gitlab']['gitlab-rails']['db_socket'] = nil #### # Unicorn diff --git a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb index 3a2aca9..7d0c296 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb @@ -7,3 +7,4 @@ production: password: "<%= @db_password %>" host: <%= @db_host %> port: <%= @db_port %> + socket: <%= @db_socket %> -- libgit2 0.21.2