summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian2013-07-11 13:43:17 +0000
committerBruce Momjian2013-07-11 13:43:17 +0000
commit921a0b20138c73a3de3067c89cf7424b3d22c1ef (patch)
treef0f2fead8df91ba039be5bbafcba1ae5dee77edd /doc/src
parent1bd25c03487dd2f96035f88c77fc0d89bb438fac (diff)
pg_upgrade: document possible pg_hba.conf options
Previously, pg_upgrade docs recommended using .pgpass if using MD5 authentication to avoid being prompted for a password. Turns out pg_ctl never prompts for a password, so MD5 requires .pgpass --- document that. Also recommend 'peer' for authentication too. Backpatch back to 9.1.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/pgupgrade.sgml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 70dc6c9b14b..c628b49d8b1 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -281,10 +281,10 @@ gmake prefix=/usr/local/pgsql.new install
<para>
<command>pg_upgrade</> will connect to the old and new servers several times,
- so you might want to set authentication to <literal>trust</> in
- <filename>pg_hba.conf</>, or if using <literal>md5</> authentication,
- use a <filename>~/.pgpass</> file (see <xref linkend="libpq-pgpass">)
- to avoid being prompted repeatedly for a password.
+ so you might want to set authentication to <literal>trust</>
+ or <literal>peer</> in <filename>pg_hba.conf</>, or if using
+ <literal>md5</> authentication, use a <filename>~/.pgpass</> file
+ (see <xref linkend="libpq-pgpass">).
</para>
</step>