public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94805 from bachp/postgresql-setup-fix

Browse Source 
nixos/postgresql: fix setup script
This commit is contained in:
Florian Klink 2020-08-06 23:50:12 +02:00 committed by GitHub
commit d7f0530a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -333,7 +333,7 @@ in
# Wait for PostgreSQL to be ready to accept connections. # Wait for PostgreSQL to be ready to accept connections.
ExecStartPost = ExecStartPost =
let let
setupScript = pkgs.writeScript "postgresql-setup" '' setupScript = pkgs.writeScript "postgresql-setup" (''
#!${pkgs.runtimeShell} -e #!${pkgs.runtimeShell} -e
PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}"
@ -360,7 +360,7 @@ in
$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
'') user.ensurePermissions)} '') user.ensurePermissions)}
'') cfg.ensureUsers} '') cfg.ensureUsers}
''; '');
in in
"+${setupScript}"; "+${setupScript}";
} }