aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2013-07-11 09:43:22 -0400
committerBruce Momjian <bruce@momjian.us>2013-07-11 09:43:22 -0400
commit886c05d8e8642572af25fee23f414bd31f2e7f3e (patch)
tree7991fed83ffdac9e9d7cbfbef432fbc813369330
parentf02b14f787980ac5b2f25407e5cd771e6b1a1dfc (diff)
downloadpostgresql-886c05d8e8642572af25fee23f414bd31f2e7f3e.tar.gz
postgresql-886c05d8e8642572af25fee23f414bd31f2e7f3e.zip
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.
-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 ebb7a60de77..8eb03755023 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -287,10 +287,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>