diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-02 00:08:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-02 00:08:02 -0700 |
| commit | b21fd5d066baadb06ca8e9a2accfcb4e94c60a09 (patch) | |
| tree | 52f852d7ad8f3a50da321d6c592070c94ec937d9 /nixos | |
| parent | 54022375eb3ae3375385717690ef133c819c9bf1 (diff) | |
| download | nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar.gz nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar.bz2 nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar.lz nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar.xz nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.tar.zst nixpkgs-b21fd5d066baadb06ca8e9a2accfcb4e94c60a09.zip | |
nixos/postgresql: Fix initdb for existing, empty postgres partitions
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 328e864ced3..97927055ce3 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -186,8 +186,9 @@ in preStart = '' # Initialise the database. - if ! test -e ${cfg.dataDir}; then + if ! test -e ${cfg.dataDir}/PG_VERSION; then mkdir -m 0700 -p ${cfg.dataDir} + rm -f ${cfg.dataDir}/*.conf if [ "$(id -u)" = 0 ]; then chown -R postgres ${cfg.dataDir} su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root' @@ -195,8 +196,6 @@ in # For non-root operation. initdb fi - rm -f ${cfg.dataDir}/*.conf - touch "${cfg.dataDir}/.first_startup" fi ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf" |