about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-26 23:14:47 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-26 23:14:47 +0300
commit89dfbd1215761438c0a041fcbef0633825b8590e (patch)
tree28d583fcf83dd637a598954819c1c29d24719b34 /nixos/modules
parentf944f4906dcc26c525b7a99c400b08c2b1d8824a (diff)
parentfb6ea3deadfbffc9bd605d68170c0e3133abcb6d (diff)
downloadnixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar.gz
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar.bz2
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar.lz
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar.xz
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.tar.zst
nixlib-89dfbd1215761438c0a041fcbef0633825b8590e.zip
Merge commit 'refs/pull/14936/head' of git://github.com/NixOS/nixpkgs
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 31ffe51c11ef..80ee32f4ee33 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -242,7 +242,7 @@ in
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                cat "${cfg.initialScript}" | psql --port=${toString cfg.port} postgres
+                psql -f "${cfg.initialScript}" --port=${toString cfg.port} postgres
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi