Merge branch '2751-update-pgbouncer-to-use-one-style-of-loggin' into 'master'

Resolve "Update pgbouncer to use one style of logging"

Closes #2751

See merge request !1918

CHANGELOG.md

@@ -6,6 +6,8 @@ omnibus-gitlab repository.
 9.5.5
+- Add more options to repmgr.conf template
+- Update pgbouncer to use one style of logging 
 - Changing pg_hba configuration should only reload PG c99ef6
 9.5.3

files/gitlab-config-template/gitlab.rb.template

@@ -1559,6 +1559,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 #   }
 #   ...
 # }
+# pgbouncer['logfile'] = nil
 # pgbouncer['auth_type'] = 'md5'
 # pgbouncer['auth_hba_file'] = nil
 # pgbouncer['auth_query'] = 'SELECT username, password FROM public.pg_shadow_lookup($1)'

files/gitlab-cookbooks/gitlab-ee/attributes/default.rb

@@ -158,6 +158,7 @@ default['gitlab']['pgbouncer']['databases_ini'] = '/var/opt/gitlab/pgbouncer/dat
 default['gitlab']['pgbouncer']['databases_ini_user'] = 'gitlab-psql'
 default['gitlab']['pgbouncer']['databases_json'] = '/var/opt/gitlab/pgbouncer/databases.json'
 default['gitlab']['pgbouncer']['databases'] = {}
+default['gitlab']['pgbouncer']['logfile'] = nil
 default['gitlab']['pgbouncer']['auth_type'] = 'md5'
 default['gitlab']['pgbouncer']['auth_hba_file'] = nil

files/gitlab-cookbooks/gitlab-ee/templates/default/pgbouncer.ini.erb

@@ -26,7 +26,9 @@
 ;;; Administrative settings
 ;;;
-logfile = <%= @log_directory %>/pgbouncer.log
+<% if @logfile %>
+logfile = <%= @logfile %>
+<% end %>
 pidfile = <%= @data_directory %>/pgbouncer.pid
 ;;;

spec/chef/gitlab-ee/recipes/pgbouncer_spec.rb

@@ -61,7 +61,6 @@ describe 'gitlab-ee::pgbouncer' do
       # Default values are pulled from:
       # https://github.com/pgbouncer/pgbouncer/blob/6ef66f0139b9c8a5c0747f2a6157d008b87bf0c5/etc/pgbouncer.ini
       expect(chef_run).to render_file(pgbouncer_ini).with_content { |content|
-        expect(content).to match(%r{^logfile = /var/log/gitlab/pgbouncer/pgbouncer\.log$})
         expect(content).to match(%r{^pidfile = /var/opt/gitlab/pgbouncer/pgbouncer\.pid$})
         expect(content).to match(/^listen_addr = 0\.0\.0\.0$/)
         expect(content).to match(/^listen_port = 6432$/)