From: Daniel Gustafsson <daniel@yesql.se>=0A=
Date: Wed, 16 Aug 2017 22:18:19 +0200=0A=
Subject: [PATCH] Remove mentions of serverside CRL and CA files=0A=
=0A=
Commit a445cb92ef5b3a31313ebce30e18cc1d6e0bdecb removed the default=0A=
filenames for serverside CRL and CA files, but left them in the docs=0A=
with a small note. This removes the note, and the previous default=0A=
names, to clarify as well as changes mentions of the filenames to=0A=
make it clearer that they are configurable.=0A=
---=0A=
 doc/src/sgml/config.sgml  | 10 ++++++----=0A=
 doc/src/sgml/libpq.sgml   |  4 ++--=0A=
 doc/src/sgml/runtime.sgml | 10 +++++-----=0A=
 doc/src/sgml/sslinfo.sgml |  2 +-=0A=
 4 files changed, 14 insertions(+), 12 deletions(-)=0A=
=0A=
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml=0A=
index 2b6255ed95..4aea9a2731 100644=0A=
--- a/doc/src/sgml/config.sgml=0A=
+++ b/doc/src/sgml/config.sgml=0A=
@@ -984,8 +984,9 @@ include_dir 'conf.d'=0A=
         and client certificate verification is not performed.=0A=
        </para>=0A=
        <para>=0A=
-        In previous releases of PostgreSQL, the name of this file was=0A=
-        hard-coded as <filename>root.crt</filename>.=0A=
+        In earlier versions of PostgreSQL, the name of this file was=0A=
+        hard-coded as <filename>root.crt</filename>. As of=0A=
+        <productname>PostgreSQL</> 9.2 it is a configuration parameter.=0A=
        </para>=0A=
       </listitem>=0A=
      </varlistentry>=0A=
@@ -1023,8 +1024,9 @@ include_dir 'conf.d'=0A=
         The default is empty, meaning no CRL file is loaded.=0A=
        </para>=0A=
        <para>=0A=
-        In previous releases of PostgreSQL, the name of this file was=0A=
-        hard-coded as <filename>root.crl</filename>.=0A=
+        In earlier versions of PostgreSQL, the name of this file was=0A=
+        hard-coded as <filename>root.crl</filename>. As of=0A=
+        <productname>PostgreSQL</> 9.2 it is a configuration parameter.=0A=
        </para>=0A=
       </listitem>=0A=
      </varlistentry>=0A=
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml=0A=
index ad5e9b95b4..b00552b883 100644=0A=
--- a/doc/src/sgml/libpq.sgml=0A=
+++ b/doc/src/sgml/libpq.sgml=0A=
@@ -7637,8 +7637,8 @@ ldap://ldap.acme.com/cn=3Ddbserver,cn=3Dhosts?pgconne=
ctinfo?base?(objectclass=3D*)=0A=
    certificate of the signing authority to the <filename>postgresql.crt</>=
=0A=
    file, then its parent authority's certificate, and so on up to a certif=
icate=0A=
    authority, <quote>root</> or <quote>intermediate</>, that is trusted by=
=0A=
-   the server, i.e. signed by a certificate in the server's=0A=
-   <filename>root.crt</filename> file.=0A=
+   the server, i.e. signed by a certificate in the server's root certifica=
te=0A=
+   file.=0A=
   </para>=0A=
=20=0A=
   <para>=0A=
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml=0A=
index 6d57525515..83115c9191 100644=0A=
--- a/doc/src/sgml/runtime.sgml=0A=
+++ b/doc/src/sgml/runtime.sgml=0A=
@@ -2264,7 +2264,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433=0A=
   <para>=0A=
    To require the client to supply a trusted certificate, place=0A=
    certificates of the certificate authorities (<acronym>CA</acronym>s)=0A=
-   you trust in the file <filename>root.crt</filename> in the data=0A=
+   you trust in a file named <filename>root.crt</filename> in the data=0A=
    directory, set the parameter <xref linkend=3D"guc-ssl-ca-file"> in=0A=
    <filename>postgresql.conf</filename> to <literal>root.crt</literal>,=0A=
    and add the authentication option <literal>clientcert=3D1</literal> to =
the=0A=
@@ -2320,8 +2320,8 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433=0A=
=20=0A=
    <para>=0A=
     <xref linkend=3D"ssl-file-usage"> summarizes the files that are=0A=
-    relevant to the SSL setup on the server.  (The shown file names are de=
fault=0A=
-    or typical names.  The locally configured names could be different.)=
=0A=
+    relevant to the SSL setup on the server.  (The shown file names are de=
fault,=0A=
+    the locally configured names could be different.)=0A=
    </para>=0A=
=20=0A=
   <table id=3D"ssl-file-usage">=0A=
@@ -2351,14 +2351,14 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433=0A=
      </row>=0A=
=20=0A=
      <row>=0A=
-      <entry><xref linkend=3D"guc-ssl-ca-file"> (<filename>$PGDATA/root.cr=
t</>)</entry>=0A=
+      <entry><xref linkend=3D"guc-ssl-ca-file"></entry>=0A=
       <entry>trusted certificate authorities</entry>=0A=
       <entry>checks that client certificate is=0A=
       signed by a trusted certificate authority</entry>=0A=
      </row>=0A=
=20=0A=
      <row>=0A=
-      <entry><xref linkend=3D"guc-ssl-crl-file"> (<filename>$PGDATA/root.c=
rl</>)</entry>=0A=
+      <entry><xref linkend=3D"guc-ssl-crl-file"></entry>=0A=
       <entry>certificates revoked by certificate authorities</entry>=0A=
       <entry>client certificate must not be on this list</entry>=0A=
      </row>=0A=
diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml=0A=
index 7bda33efa3..c720601cf5 100644=0A=
--- a/doc/src/sgml/sslinfo.sgml=0A=
+++ b/doc/src/sgml/sslinfo.sgml=0A=
@@ -150,7 +150,7 @@=0A=
     </para>=0A=
     <para>=0A=
      This function is really useful only if you have more than one trusted=
 CA=0A=
-     certificate in your server's <filename>root.crt</> file, or if this C=
A=0A=
+     certificate in your server's root certificate file, or if this CA=0A=
      has issued some intermediate certificate authority certificates.=0A=
     </para>=0A=
     </listitem>=0A=
--=20=0A=
2.14.1.145.gb3622a4ee=0A=
=0A=

--Apple-Mail=_D3FFCE38-4C99-42F1-944E-4FA5E3AD24BB
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-docs mailing list (pgsql-docs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-docs

--Apple-Mail=_D3FFCE38-4C99-42F1-944E-4FA5E3AD24BB--