summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-04-11 19:23:03 -0400
committerShea Levy <shea@shealevy.com>2014-04-11 19:23:03 -0400
commit0122697550ab9ed5fae949a0756b10d6e674bd70 (patch)
tree82e5611c04c4474f90b7245e14c39f53a6f161ed /nixos/modules
parent9b077bac584c3d192ea0ba5be0a93a5a5c570208 (diff)
downloadnixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar.gz
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar.bz2
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar.lz
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar.xz
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.tar.zst
nixlib-0122697550ab9ed5fae949a0756b10d6e674bd70.zip
Revert "Merge branch 'postgresql-user' of git://github.com/ocharles/nixpkgs"
Reverting postgres superuser changes until after stable.

This reverts commit 6cc0cc7ff6136963acb32b5107696484b6220562, reversing
changes made to 3c4be425dbe2d5a00f2923210a86ce7e7a4c516f.
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 a83b1a110fed..cc4230d4d6a7 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -190,7 +190,7 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 if [ "$(id -u)" = 0 ]; then
                   chown -R postgres ${cfg.dataDir}
-                  su -s ${pkgs.stdenv.shell} postgres -c initdb
+                  su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
                 else
                   # For non-root operation.
                   initdb