aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2013-07-11 09:43:15 -0400
committerBruce Momjian <bruce@momjian.us>2013-07-11 09:43:15 -0400
commitad4c625ee464b409f341d4680127e816391fe94f (patch)
tree54fe60aff77c8c4a4ec3eb338475d1291d27017c
parent271f7b0f8ab8f584fafc7703f1a9ac14d81ca21d (diff)
downloadpostgresql-ad4c625ee464b409f341d4680127e816391fe94f.tar.gz
postgresql-ad4c625ee464b409f341d4680127e816391fe94f.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 cb4396aa014..6012523dbc7 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -253,10 +253,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>