[couchdb] 04/04: Merge pull request #2645 from danielbarbarito/users-db-security-editable-ini-fix

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch 3.x-backports-from-master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit fc0bc94274ef99a1bdef266d5c4b67c961caf299
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Mar 9 15:45:36 2020 +0000

    Merge pull request #2645 from danielbarbarito/users-db-security-editable-ini-fix
    
    Move "users_db_security_editable" to the correct location in the ini file
---
 rel/overlay/etc/default.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index d64b88f..d58abff 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -73,6 +73,9 @@ default_engine = couch
 ; on startup if not present.
 ;single_node = false
 
+; Allow edits on the _security object in the user db. By default, it's disabled.
+users_db_security_editable = false
+
 [purge]
 ; Allowed maximum number of documents in one purge request
 ;max_document_id_number = 100
@@ -84,9 +87,6 @@ default_engine = couch
 ; document. Default is 24 hours.
 ;index_lag_warn_seconds = 86400
 
-; Allow edits on the _security object in the user db. By default, it's disabled.
-users_db_security_editable = false
-
 [couchdb_engines]
 ; The keys in this section are the filename extension that
 ; the specified engine module will use. This is important so