alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #4294 from daogames/tb/psql-port-fix

Browse source 
postgresql: use configured port when invoking psql
This commit is contained in:
Austin Seipp 2014-10-01 18:56:39 -05:00
parent 5f7d5c09f3 eb7bbb4862
commit 8cc3460a87
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/databases/postgresql.nix
View file

@ -225,14 +225,14 @@ in
# Wait for PostgreSQL to be ready to accept connections.
postStart =
''
while ! psql postgres -c "" 2> /dev/null; do
while ! psql --port=${toString cfg.port} postgres -c "" 2> /dev/null; do
if ! kill -0 "$MAINPID"; then exit 1; fi
sleep 0.1
done
if test -e "${cfg.dataDir}/.first_startup"; then
${optionalString (cfg.initialScript != null) ''
cat "${cfg.initialScript}" | psql postgres
cat "${cfg.initialScript}" | psql --port=${toString cfg.port} postgres
''}
rm -f "${cfg.dataDir}/.first_startup"
fi