Skip to content
Snippets Groups Projects
Commit eb4a80db authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'fix-fdw-deprecation-notice' into 'master'

Do not set default values for deprecated fdw settings

See merge request gitlab-org/omnibus-gitlab!4528
parents e74d1844 b02bfd17
No related branches found
No related tags found
No related merge requests found
---
title: Fix geo fdw deprecation message
merge_request: 4528
author:
type: fixed
module GeoPostgresql
class << self
def parse_variables
Gitlab['geo_postgresql']['fdw_external_user'] ||=
Gitlab['gitlab_rails']['db_username'] || node['gitlab']['gitlab-rails']['db_username']
Gitlab['geo_postgresql']['fdw_external_password'] ||=
Gitlab['gitlab_rails']['db_password'] || node['gitlab']['gitlab-rails']['db_password']
postgresql_dir = Gitlab['geo_postgresql']['dir'] || node['gitlab']['geo-postgresql']['dir']
 
Gitlab['geo_postgresql']['unix_socket_directory'] ||= postgresql_dir
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment