Merge branch...

Merge branch '3469-standalone-pgbouncer-not-using-the-correct-user-to-connect-to-the-database' into 'master'

Resolve "Standalone pgbouncer not using the correct user to connect to the database"

Closes #3469

See merge request gitlab-org/omnibus-gitlab!2482

CHANGELOG.md

@@ -22,6 +22,7 @@ omnibus-gitlab repository.
 - Restart runsv when log directory is changed 0a784647b
 - Bump rsync to 3.1.3 f539aa946
 - Patch bzip2 against CVE-2016-3189 552730bfa
+- Fix pgbouncer recipe to use the correct user for standalone instances
 10.7.0

files/gitlab-cookbooks/gitlab-ee/recipes/pgbouncer.rb

@@ -72,7 +72,7 @@ execute 'generate databases.ini' do
      --hostuser #{node['gitlab']['pgbouncer']['databases_ini_user']} \
      --pg-host #{node['gitlab']['pgbouncer']['listen_addr']} \
      --pg-port #{node['gitlab']['pgbouncer']['listen_port']} \
-     --user #{node['gitlab']['pgbouncer']['databases_ini_user']}
+     --user #{node['gitlab']['postgresql']['pgbouncer_user']}
     EOF
   }
   action :nothing