Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita057220

Browse files
committed
doc: Remove mentions of server-side CRL and CA file names
Commita445cb9 removed the default filenames for server-side CRL and CA files, but left them in the docs with asmall note. This removes the note and the previous default names toclarify, as well as changes mentions of the file names to make itclearer that they are configurable.Author: Daniel Gustafsson <daniel@yesql.se>Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
1 parentb79d69b commita057220

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -983,10 +983,6 @@ include_dir 'conf.d'
983983
The default is empty, meaning no CA file is loaded,
984984
and client certificate verification is not performed.
985985
</para>
986-
<para>
987-
In previous releases of PostgreSQL, the name of this file was
988-
hard-coded as <filename>root.crt</filename>.
989-
</para>
990986
</listitem>
991987
</varlistentry>
992988

@@ -1022,10 +1018,6 @@ include_dir 'conf.d'
10221018
file or on the server command line.
10231019
The default is empty, meaning no CRL file is loaded.
10241020
</para>
1025-
<para>
1026-
In previous releases of PostgreSQL, the name of this file was
1027-
hard-coded as <filename>root.crl</filename>.
1028-
</para>
10291021
</listitem>
10301022
</varlistentry>
10311023

‎doc/src/sgml/libpq.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7638,8 +7638,8 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
76387638
certificate of the signing authority to the <filename>postgresql.crt</>
76397639
file, then its parent authority's certificate, and so on up to a certificate
76407640
authority, <quote>root</> or <quote>intermediate</>, that is trusted by
7641-
the server, i.e. signed by a certificate in the server's
7642-
<filename>root.crt</filename>file.
7641+
the server, i.e. signed by a certificate in the server's root CA file
7642+
(<xref linkend="guc-ssl-ca-file">).
76437643
</para>
76447644

76457645
<para>

‎doc/src/sgml/runtime.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
22642264
<para>
22652265
To require the client to supply a trusted certificate, place
22662266
certificates of the certificate authorities (<acronym>CA</acronym>s)
2267-
you trust inthe file <filename>root.crt</filename> in the data
2267+
you trust ina file named <filename>root.crt</filename> in the data
22682268
directory, set the parameter <xref linkend="guc-ssl-ca-file"> in
22692269
<filename>postgresql.conf</filename> to <literal>root.crt</literal>,
22702270
and add the authentication option <literal>clientcert=1</literal> to the
@@ -2321,7 +2321,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
23212321
<para>
23222322
<xref linkend="ssl-file-usage"> summarizes the files that are
23232323
relevant to the SSL setup on the server. (The shown file names are default
2324-
or typicalnames. The locally configured names could be different.)
2324+
names. The locally configured names could be different.)
23252325
</para>
23262326

23272327
<table id="ssl-file-usage">
@@ -2351,14 +2351,14 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
23512351
</row>
23522352

23532353
<row>
2354-
<entry><xref linkend="guc-ssl-ca-file"> (<filename>$PGDATA/root.crt</>)</entry>
2354+
<entry><xref linkend="guc-ssl-ca-file"></entry>
23552355
<entry>trusted certificate authorities</entry>
23562356
<entry>checks that client certificate is
23572357
signed by a trusted certificate authority</entry>
23582358
</row>
23592359

23602360
<row>
2361-
<entry><xref linkend="guc-ssl-crl-file"> (<filename>$PGDATA/root.crl</>)</entry>
2361+
<entry><xref linkend="guc-ssl-crl-file"></entry>
23622362
<entry>certificates revoked by certificate authorities</entry>
23632363
<entry>client certificate must not be on this list</entry>
23642364
</row>

‎doc/src/sgml/sslinfo.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</para>
151151
<para>
152152
This function is really useful only if you have more than one trusted CA
153-
certificate in your server's<filename>root.crt</> file, or if this CA
153+
certificate in your server'scertificate authority file, or if this CA
154154
has issued some intermediate certificate authority certificates.
155155
</para>
156156
</listitem>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp