From 6a65104e7f883b75e76d03d8919243a5634a5c19 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Mon, 3 Apr 2023 14:41:57 +0200 Subject: [PATCH] fix return value of clusterstore.connect and disable auth basic for LE challenges --- src/bw/lua/clusterstore.lua | 6 +++++- .../letsencrypt/confs/default-server-http/lets-encrypt.conf | 1 + .../core/letsencrypt/confs/server-http/lets-encrypt.conf | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bw/lua/clusterstore.lua b/src/bw/lua/clusterstore.lua index eaf0bc327..fe43d62ab 100644 --- a/src/bw/lua/clusterstore.lua +++ b/src/bw/lua/clusterstore.lua @@ -33,7 +33,11 @@ function M:connect() if variables["REDIS_SSL"] == "yes" then options["ssl"] = true end - return redis.connect(variables["REDIS_HOST"], tonumber(variables["REDIS_PORT"]), options) + local ok, err = redis_client:connect(variables["REDIS_HOST"], tonumber(variables["REDIS_PORT"]), options) + if not ok then + return false, err + end + return redis_client end function M:close(redis_client) diff --git a/src/common/core/letsencrypt/confs/default-server-http/lets-encrypt.conf b/src/common/core/letsencrypt/confs/default-server-http/lets-encrypt.conf index 6c96dc58e..b7e879315 100644 --- a/src/common/core/letsencrypt/confs/default-server-http/lets-encrypt.conf +++ b/src/common/core/letsencrypt/confs/default-server-http/lets-encrypt.conf @@ -1,4 +1,5 @@ # set location for challenges location ~ ^/.well-known/acme-challenge/ { root /var/tmp/bunkerweb/lets-encrypt; + auth_basic off; } \ No newline at end of file diff --git a/src/common/core/letsencrypt/confs/server-http/lets-encrypt.conf b/src/common/core/letsencrypt/confs/server-http/lets-encrypt.conf index b15472e0a..814eefd29 100644 --- a/src/common/core/letsencrypt/confs/server-http/lets-encrypt.conf +++ b/src/common/core/letsencrypt/confs/server-http/lets-encrypt.conf @@ -1,6 +1,7 @@ # set location for challenges location ~ ^/.well-known/acme-challenge/ { root /var/tmp/bunkerweb/lets-encrypt; + auth_basic off; } {% if AUTO_LETS_ENCRYPT == "yes" %}