[GitHub] wohali closed pull request #282: Clarify use of relevant [admins] section

[GitBox <gi...@apache.org>]

wohali closed pull request #282: Clarify use of relevant [admins] section
URL: https://github.com/apache/couchdb-documentation/pull/282
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/config/auth.rst b/src/config/auth.rst
index 8a22a2a..4d2cc51 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -29,9 +29,12 @@ Server Administrators
     users. This configuration is known as `Admin Party`, and is not recommended
     for in-production usage. You can crash the party simply by creating the
     first admin account. CouchDB server administrators and passwords are not
-    stored in the ``_users`` database, but in the ``local.ini`` file, which
-    should be appropriately secured and readable only by system
-    administrators::
+    stored in the ``_users`` database, but in the last ``[admins]`` section
+    that CouchDB finds when loading its ini files. See :config:intro for
+    details on config file order and behaviour. This file (which could be
+    something like ``etc/local.ini`` or ``etc/local.d/10-admins.ini`` on a
+    Debian/Ubuntu system installed from packages) should be appropriately
+    secured and readable only by system administrators::
 
         [admins]
         ;admin = mysecretpassword
@@ -69,9 +72,8 @@ Server Administrators
         }
 
     If you already have a salted, encrypted password string (for example, from
-    an old ``local.ini`` file, or from a different CouchDB server), then you
-    can store the "raw" encrypted string, without having CouchDB doubly encrypt
-    it.
+    an old ini file, or from a different CouchDB server), then you can store
+    the "raw" encrypted string, without having CouchDB doubly encrypt it.
 
     .. code-block:: http
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services