diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-11-25 16:31:16 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-11-25 16:33:40 +0100 |
| commit | 2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85 (patch) | |
| tree | 5564005e2fe623af69b01d56c9c72baf8ec68402 /src/backend/commands/extension.c | |
| parent | ab69ea9feeb9a02c6299b5c1b786005552343f22 (diff) | |
| download | postgresql-2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85.tar.gz postgresql-2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85.zip | |
Integrate recovery.conf into postgresql.conf
recovery.conf settings are now set in postgresql.conf (or other GUC
sources). Currently, all the affected settings are PGC_POSTMASTER;
this could be refined in the future case by case.
Recovery is now initiated by a file recovery.signal. Standby mode is
initiated by a file standby.signal. The standby_mode setting is
gone. If a recovery.conf file is found, an error is issued.
The trigger_file setting has been renamed to promote_trigger_file as
part of the move.
The documentation chapter "Recovery Configuration" has been integrated
into "Server Configuration".
pg_basebackup -R now appends settings to postgresql.auto.conf and
creates a standby.signal file.
Author: Fujii Masao <masao.fujii@gmail.com>
Author: Simon Riggs <simon@2ndquadrant.com>
Author: Abhijit Menon-Sen <ams@2ndquadrant.com>
Author: Sergei Kornilov <sk@zsrv.org>
Discussion: https://www.postgresql.org/message-id/flat/607741529606767@web3g.yandex.ru/
Diffstat (limited to 'src/backend/commands/extension.c')
| -rw-r--r-- | src/backend/commands/extension.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index a587a1bc03e..87e4dd82453 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -9,8 +9,8 @@ * dependent objects can be associated with it. An extension is created by * populating the pg_extension catalog from a "control" file. * The extension control file is parsed with the same parser we use for - * postgresql.conf and recovery.conf. An extension also has an installation - * script file, containing SQL commands to create the extension's objects. + * postgresql.conf. An extension also has an installation script file, + * containing SQL commands to create the extension's objects. * * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California |