Skip to content
Snippets Groups Projects
Unverified Commit 3b1fcd2d authored by Ian Baum's avatar Ian Baum
Browse files

Update pgbouncer recipes default databases.ini user

Use the pgbouncer user by default
parent edaacaa6
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -63,6 +63,8 @@ file 'databases.json' do
notifies :run, 'execute[generate databases.ini]', :immediately
end
 
ini_user = node['gitlab']['postgresql']['pgbouncer_user'] || node['gitlab']['pgbouncer']['databases_ini_user']
execute 'generate databases.ini' do
command lazy {
<<~EOF
Loading
Loading
@@ -72,7 +74,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 #{ini_user}
EOF
}
action :nothing
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