diff options
| author | Bruce Momjian | 2020-12-28 02:37:42 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2020-12-28 02:37:42 +0000 |
| commit | 3187ef7c46c5b884267a88f2d6119c9a05f1bbba (patch) | |
| tree | 6ff5e31d8ffaaf806ee908fe2ef8733c7ba348ef /doc/src/sgml/ref/pgupgrade.sgml | |
| parent | facad31474ac6dace3894ebc7c45dc3cc829422e (diff) | |
Revert "Add key management system" (978f869b99) & later commits
The patch needs test cases, reorganization, and cfbot testing.
Technically reverts commits 5c31afc49d..e35b2bad1a (exclusive/inclusive)
and 08db7c63f3..ccbe34139b.
Reported-by: Tom Lane, Michael Paquier
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'doc/src/sgml/ref/pgupgrade.sgml')
| -rw-r--r-- | doc/src/sgml/ref/pgupgrade.sgml | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index b1bcdb77a30..92e1d09a55c 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -168,15 +168,6 @@ PostgreSQL documentation </varlistentry> <varlistentry> - <term><option>-R</option></term> - <term><option>--authprompt</option></term> - <listitem><para>allows <option>ssl_passphrase_command</option> or - <option>cluster_key_command</option> to prompt for a passphrase - or PIN. - </para></listitem> - </varlistentry> - - <varlistentry> <term><option>-s</option> <replaceable>dir</replaceable></term> <term><option>--socketdir=</option><replaceable>dir</replaceable></term> <listitem><para>directory to use for postmaster sockets during upgrade; @@ -318,9 +309,7 @@ make prefix=/usr/local/pgsql.new install Again, use compatible <command>initdb</command> flags that match the old cluster. Many prebuilt installers do this step automatically. There is no need to - start the new cluster. If upgrading a cluster that uses - cluster file encryption, the <command>initdb</command> option - <option>--copy-encryption-keys</option> must be specified. + start the new cluster. </para> </step> @@ -849,13 +838,6 @@ psql --username=postgres --file=script.sql postgres is down. </para> - <para> - If the old cluster uses file encryption, the new cluster must use - the same keys, so <command>pg_upgrade</command> copies them to the - new cluster. It is necessary to initialize the new cluster with - the same <varname>cluster_key_command</varname> and the same - file encryption key length. - </para> </refsect1> <refsect1> |