Merge 28a8fa05cc into 960f555790

fix: ensure certStore is initialised when adding custom cert (#639 )
Fixes: #612
2025-07-01 08:23:33 +10:00 · 2025-06-30 18:58:39 +02:00 · 2025-06-25 13:28:09 +02:00
2 changed files with 5 additions and 2 deletions
--- a/4
+++ b/4
@ -2,8 +2,8 @@ BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILDDATE ?= $(shell date -u +%FT%T%z)
 BUILDTS   ?= $(shell date -u +%s)
 REVISION  ?= $(shell git rev-parse HEAD)
-VERSION_DEV ?= 0.4.5-dev$(shell date +%Y%m%d%H%M)
-VERSION ?= 0.4.4
+VERSION_DEV ?= 0.4.6-dev$(shell date +%Y%m%d%H%M)
+VERSION ?= 0.4.5

 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm
--- a/web_tls.go
+++ b/web_tls.go
@ -108,6 +108,9 @@ func setTLSState(s TLSState) error {
 			isChanged = true
 		}
 		// parse pem to cert and key
+		if certStore == nil {
+			initCertStore()
+		}
 		err, _ := certStore.ValidateAndSaveCertificate(webSecureCustomCertificateName, s.Certificate, s.PrivateKey, true)
 		// warn doesn't matter as ... we don't know the hostname yet
 		if err != nil {
Author	SHA1	Message	Date
Qishuai Liu	1efa74ba72	Merge `28a8fa05cc` into `960f555790`	2025-07-01 08:23:33 +10:00
iain MacDonnell	960f555790	fix: ensure certStore is initialised when adding custom cert (#639 ) Fixes: #612	2025-06-30 18:58:39 +02:00
Siyuan Miao	fe127ed41c	chore: bump version to 0.4.6	2025-06-25 13:28:09 +02:00