swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 00:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'psql-fix' of git://github.com/proger/nixpkgs

Browse source 
postgresql: properly fix permissions issue by in postStart
This commit is contained in:
Shea Levy 2014-03-31 21:45:11 -04:00
parent b86d946631 c66be6378d
commit c37bbda4a3
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 ! 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
if test -e "${cfg.dataDir}/.first_startup"; then
${optionalString (cfg.initialScript != null) ''
cat "${cfg.initialScript}" | psql postgres
cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres'
''}
rm -f "${cfg.dataDir}/.first_startup"
fi