diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2018-07-24 03:26:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 03:26:17 -0400 |
| commit | 6bce55bfcac88db93a3830b42ccc0ce5806e0efe (patch) | |
| tree | 781b08d90c598443c9509f0f62301dcb817e88b0 | |
| parent | 6936d9edd66982f56240ea8cb27516547ee9a046 (diff) | |
| parent | 98eec314ca4cf05399cc44d330d5abf038e399c1 (diff) | |
| download | couchdb-bump-fauxton.tar.gz | |
Merge branch 'master' into bump-fauxtonbump-fauxton
| -rw-r--r-- | rel/overlay/etc/default.ini | 9 | ||||
| -rw-r--r-- | src/couch_replicator/src/couch_replicator_auth.erl | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index aa9763ce0..084a16ec2 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -433,13 +433,12 @@ ssl_certificate_max_depth = 3 ; There are currently two plugins available: ; couch_replicator_auth_session - use _session cookie authentication ; couch_replicator_auth_noop - use basic authentication (previous default) -; Currently previous default behavior is still the default. To start using -; session auth, use this as the list of plugins: -; `couch_replicator_auth_session,couch_replicator_auth_noop`. -; In a future release the session plugin might be used by default. +; Currently, the new _session cookie authentication is tried first, before +; falling back to the old basic authenticaion default: +;auth_plugins = couch_replicator_auth_session,couch_replicator_auth_noop +; To restore the old behaviour, use the following value: ;auth_plugins = couch_replicator_auth_noop - [compaction_daemon] ; The delay, in seconds, between each check for which database and view indexes ; need to be compacted. diff --git a/src/couch_replicator/src/couch_replicator_auth.erl b/src/couch_replicator/src/couch_replicator_auth.erl index 60273fc32..7f51cdd1c 100644 --- a/src/couch_replicator/src/couch_replicator_auth.erl +++ b/src/couch_replicator/src/couch_replicator_auth.erl @@ -28,7 +28,7 @@ -type code() :: non_neg_integer(). --define(DEFAULT_PLUGINS, "couch_replicator_auth_noop"). +-define(DEFAULT_PLUGINS, "couch_replicator_auth_session,couch_replicator_auth_noop"). % Behavior API |