gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from nawadanp/master 

Add sslmode support to pgsql database
This commit is contained in:
Marin Jankovski 2015-06-01 13:17:54 +02:00
parent 0f468e0781 77213ad3fe
commit dbeb00346c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -154,6 +154,8 @@ default['gitlab']['gitlab-rails']['db_password'] = nil
default['gitlab']['gitlab-rails']['db_host'] = nil
default['gitlab']['gitlab-rails']['db_port'] = 5432
default['gitlab']['gitlab-rails']['db_socket'] = nil
default['gitlab']['gitlab-rails']['db_sslmode'] = nil
default['gitlab']['gitlab-rails']['db_sslrootcert'] = nil
default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
default['gitlab']['gitlab-rails']['redis_port'] = nil

2
files/gitlab-cookbooks/gitlab/templates/default/database.yml.erb
View File

@ -12,3 +12,5 @@ production:
host: <%= single_quote(@db_host) %>
port: <%= @db_port %>
socket: <%= single_quote(@db_socket) %>
sslmode: <%= single_quote(@db_sslmode) %>
sslrootcert: <%= single_quote(@db_sslrootcert) %>