summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTino Breddin <tino@daogames.com>2014-09-27 14:37:11 +0200
committerTino Breddin <tino@daogames.com>2014-09-27 14:37:11 +0200
commiteb7bbb486283824da630212af4e9d514d44f88bd (patch)
tree4cda700424f70fccebe0d37ccbaff81e589e2c54 /nixos
parent7323d5e1289a8da957172dbdf92bb7ebf72dd963 (diff)
downloadnixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar.gz
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar.bz2
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar.lz
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar.xz
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.tar.zst
nixpkgs-eb7bbb486283824da630212af4e9d514d44f88bd.zip
postgresql: use configured port when invoking psql
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/databases/postgresql.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 01c55479b2b..de14c56f797 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -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