diff options
| author | Jan Lehnardt <jan@apache.org> | 2021-10-30 17:49:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 17:49:32 +0200 |
| commit | 285d81e3a3f1adf8cbaec5421881b15362a981f8 (patch) | |
| tree | 12121ac708cc150498af123b14adfbe2d3ae1b16 | |
| parent | 5b1fd09df2203c28605e93d4d47b46bba274becf (diff) | |
| parent | d0cd82c2ab53b1075b22f813364abe6c1dc46255 (diff) | |
| download | couchdb-feat/metrics-role-for-prmetheus.tar.gz | |
Merge branch '3.x' into feat/metrics-role-for-prmetheusfeat/metrics-role-for-prmetheus
| -rw-r--r-- | src/couch/src/couch_httpd_auth.erl | 2 | ||||
| -rw-r--r-- | src/setup/src/setup.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/couch/src/couch_httpd_auth.erl b/src/couch/src/couch_httpd_auth.erl index dfc9394e5..01a210d05 100644 --- a/src/couch/src/couch_httpd_auth.erl +++ b/src/couch/src/couch_httpd_auth.erl @@ -315,7 +315,7 @@ ensure_cookie_auth_secret() -> case chttpd_util:get_chttpd_auth_config("secret") of undefined -> NewSecret = ?b2l(couch_uuids:random()), - config:set("couch_httpd_auth", "secret", NewSecret), + config:set("chttpd_auth", "secret", NewSecret), NewSecret; Secret -> Secret end. diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl index 5129765da..56773e4da 100644 --- a/src/setup/src/setup.erl +++ b/src/setup/src/setup.erl @@ -254,8 +254,8 @@ sync_uuid() -> sync_config("couchdb", "uuid", Uuid). sync_auth_secret() -> - Secret = config:get("couch_httpd_auth", "secret"), - sync_config("couch_httpd_auth", "secret", Secret). + Secret = config:get("chttpd_auth", "secret"), + sync_config("chttpd_auth", "secret", Secret). sync_config(Section, Key, Value) -> |