From c23050e23136a5aeaca2f93a0d0bdca66607e348 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Apr 2014 19:21:50 -0400 Subject: [PATCH 1/4] Revert "Use PostgreSQL 9.3's `pg_isready` to wait for connectivity" Reverting postgres superuser changes until after stable. This reverts commit e2066841106a6b89093ab685368742efa4e3c2c1. --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ed66c15e304..08a9cdd9f5d 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -226,7 +226,7 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - while ! ${pkgs.postgresql93}/bin/pg_isready > /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 From e9e60103de7fa4572c28d8fd1ecf5b9ed3178fb8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Apr 2014 19:22:39 -0400 Subject: [PATCH 2/4] Revert "Create the 'postgres' superuser" Reverting postgres superuser changes until after stable. This reverts commit 7de29bd26f5e514e95d5d261c08f3029337eecb3. --- nixos/modules/services/databases/postgresql.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 08a9cdd9f5d..33ee7244e3f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -197,7 +197,6 @@ in fi rm -f ${cfg.dataDir}/*.conf touch "${cfg.dataDir}/.first_startup" - touch "${cfg.dataDir}/postgresql-user-created" fi ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf" @@ -231,11 +230,6 @@ in sleep 0.1 done - if ! [ -e ${cfg.dataDir}/postgresql-user-created ]; then - createuser --superuser postgres - touch ${cfg.dataDir}/postgresql-user-created - fi - if test -e "${cfg.dataDir}/.first_startup"; then ${optionalString (cfg.initialScript != null) '' cat "${cfg.initialScript}" | su -s ${pkgs.stdenv.shell} postgres -c 'psql postgres' From 9b077bac584c3d192ea0ba5be0a93a5a5c570208 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Apr 2014 19:22:43 -0400 Subject: [PATCH 3/4] 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(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 33ee7244e3f..a83b1a110fe 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 From 0122697550ab9ed5fae949a0756b10d6e674bd70 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Apr 2014 19:23:03 -0400 Subject: [PATCH 4/4] 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. --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index a83b1a110fe..cc4230d4d6a 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