mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00
nixos/postgresql: remove recoveryConfig option
Since v12, PostgreSQL doesn't support recovery.conf anymore and fails to start up when this option is set: FATAL: using recovery command file "recovery.conf" is not supported This is documented at: https://www.postgresql.org/docs/current/recovery-config.html
This commit is contained in:
parent
8b9086b2dd
commit
7d0363742c
1 changed files with 6 additions and 12 deletions
|
@ -90,6 +90,12 @@ in
|
||||||
"extraConfig"
|
"extraConfig"
|
||||||
] "Use services.postgresql.settings instead.")
|
] "Use services.postgresql.settings instead.")
|
||||||
|
|
||||||
|
(mkRemovedOptionModule [
|
||||||
|
"services"
|
||||||
|
"postgresql"
|
||||||
|
"recoveryConfig"
|
||||||
|
] "PostgreSQL v12+ doesn't support recovery.conf.")
|
||||||
|
|
||||||
(mkRenamedOptionModule
|
(mkRenamedOptionModule
|
||||||
[ "services" "postgresql" "logLinePrefix" ]
|
[ "services" "postgresql" "logLinePrefix" ]
|
||||||
[ "services" "postgresql" "settings" "log_line_prefix" ]
|
[ "services" "postgresql" "settings" "log_line_prefix" ]
|
||||||
|
@ -588,14 +594,6 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
recoveryConfig = mkOption {
|
|
||||||
type = types.nullOr types.lines;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
Contents of the {file}`recovery.conf` file.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
superUser = mkOption {
|
superUser = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "postgres";
|
default = "postgres";
|
||||||
|
@ -741,10 +739,6 @@ in
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -sfn "${configFile}/postgresql.conf" "${cfg.dataDir}/postgresql.conf"
|
ln -sfn "${configFile}/postgresql.conf" "${cfg.dataDir}/postgresql.conf"
|
||||||
${optionalString (cfg.recoveryConfig != null) ''
|
|
||||||
ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
|
|
||||||
"${cfg.dataDir}/recovery.conf"
|
|
||||||
''}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Wait for PostgreSQL to be ready to accept connections.
|
# Wait for PostgreSQL to be ready to accept connections.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue