Merge branch 'support-sslca-mysql' into 'master'
Add support for setting db_sslca in gitlab.rb Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/789 db_sslca and db_sslrootcert mean the same thing, but are used by different activerecord adapters Added support for setting either one for setting the ca cert Not currently adding db_sslca cert to the gitlab.rb.template because having two settings for the same thing is confusing See merge request !712
This commit is contained in:
commit
2b4033cb78
|
@ -5,6 +5,7 @@ omnibus-gitlab repository.
|
|||
|
||||
8.7.0
|
||||
|
||||
- Added db_sslca to the configuration options for connecting to an external database
|
||||
- Compile NGINX with the real_ip module and add configuration options
|
||||
- Support the ability to change mattermost UID and GID
|
||||
- Updated libicu to 56.1 4de944d9
|
||||
|
|
|
@ -210,6 +210,7 @@ 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']['db_sslca'] = nil
|
||||
|
||||
default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
|
||||
default['gitlab']['gitlab-rails']['redis_port'] = nil
|
||||
|
|
|
@ -14,4 +14,5 @@ production:
|
|||
port: <%= @db_port %>
|
||||
socket: <%= single_quote(@db_socket) %>
|
||||
sslmode: <%= single_quote(@db_sslmode) %>
|
||||
sslrootcert: <%= single_quote(@db_sslrootcert) %>
|
||||
sslrootcert: <%= single_quote(@db_sslrootcert) || single_quote(@db_sslca) %>
|
||||
sslca: <%= single_quote(@db_sslca) || single_quote(@db_sslrootcert) %>
|
||||
|
|
Loading…
Reference in New Issue