mirror of
https://github.com/pi-hole/FTL.git
synced 2025-12-20 05:58:25 +00:00
Merge pull request #2666 from pi-hole/tweak/renewal_without_https
Do not try to renew certificate that is not used
This commit is contained in:
@@ -335,6 +335,7 @@ enum cert_check {
|
|||||||
CERT_NOT_YET_VALID,
|
CERT_NOT_YET_VALID,
|
||||||
CERT_EXPIRES_SOON,
|
CERT_EXPIRES_SOON,
|
||||||
CERT_OKAY,
|
CERT_OKAY,
|
||||||
|
CERT_NOT_IN_USE
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
enum http_method {
|
enum http_method {
|
||||||
|
|||||||
@@ -1042,7 +1042,10 @@ void *webserver_thread(void *val)
|
|||||||
while(!killed)
|
while(!killed)
|
||||||
{
|
{
|
||||||
// Check if the certificate is about to expire soon
|
// Check if the certificate is about to expire soon
|
||||||
const enum cert_check status = cert_currently_valid(config.webserver.tls.cert.v.s, 2);
|
// We check only if HTTPS is enabled (https_port > 0)
|
||||||
|
const enum cert_check status = https_port == 0 ?
|
||||||
|
CERT_NOT_IN_USE :
|
||||||
|
cert_currently_valid(config.webserver.tls.cert.v.s, 2);
|
||||||
|
|
||||||
if(status == CERT_EXPIRES_SOON &&
|
if(status == CERT_EXPIRES_SOON &&
|
||||||
config.webserver.tls.validity.v.ui > 0)
|
config.webserver.tls.validity.v.ui > 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user