summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-04-11 19:21:50 -0400
committerShea Levy <shea@shealevy.com>2014-04-11 19:21:50 -0400
commitc23050e23136a5aeaca2f93a0d0bdca66607e348 (patch)
treed923714f9e2d51aa3f38b635be895ef6906ee3c7 /nixos/modules
parentb21853f2550db54a9494e51bc51274a23e54a57f (diff)
downloadnixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar.gz
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar.bz2
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar.lz
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar.xz
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.tar.zst
nixlib-c23050e23136a5aeaca2f93a0d0bdca66607e348.zip
Revert "Use PostgreSQL 9.3's `pg_isready` to wait for connectivity"
Reverting postgres superuser changes until after stable.

This reverts commit e2066841106a6b89093ab685368742efa4e3c2c1.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/databases/postgresql.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index ed66c15e304d..08a9cdd9f5da 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -226,7 +226,7 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! ${pkgs.postgresql93}/bin/pg_isready > /dev/null; do
+            while ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done