From 9b077bac584c3d192ea0ba5be0a93a5a5c570208 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Apr 2014 19:22:43 -0400 Subject: Revert "postgresql: properly fix permissions issue by in postStart" Reverting postgres superuser changes until after stable. This reverts commit c66be6378d8bbcea271b2d2102741fdda87ec8fe. --- nixos/modules/services/databases/postgresql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 33ee7244e3f4..a83b1a110fed 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 ! su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres -c ""' 2> /dev/null; do + while ! psql 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}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres' + cat "${cfg.initialScript}" | psql postgres ''} rm -f "${cfg.dataDir}/.first_startup" fi -- cgit 1.4.1