Merge 2861df3c17 into 960f555790

fix: ensure certStore is initialised when adding custom cert (#639 )
Fixes: #612
2025-06-30 13:19:42 -05:00 · 2025-06-30 18:58:39 +02:00 · 2025-06-12 13:28:31 -05:00
2 changed files with 7 additions and 2 deletions
--- a/ui/src/components/Header.tsx
+++ b/ui/src/components/Header.tsx
@ -60,8 +60,10 @@ export default function DashboardNavbar({
        <div className="flex h-14 items-center justify-between">
          <div className="flex shrink-0 items-center gap-x-8">
            <div className="inline-block shrink-0">
-              <img src={LogoBlueIcon} alt="" className="h-[24px] dark:hidden" />
-              <img src={LogoWhiteIcon} alt="" className="hidden h-[24px] dark:block" />
+              <a href="https://jetkvm.com/" target="_blank" rel="norefferer noreferrer" title="Learn more about JetKVM">
+                <img src={LogoBlueIcon} alt="" className="h-[24px] dark:hidden" />
+                <img src={LogoWhiteIcon} alt="" className="hidden h-[24px] dark:block" />
+              </a>
            </div>

            <div className="flex gap-x-2">
--- 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
Marc Brooks	aca3f3352d	Merge `2861df3c17` into `960f555790`	2025-06-30 13:19:42 -05:00
iain MacDonnell	960f555790	fix: ensure certStore is initialised when adding custom cert (#639 ) Fixes: #612	2025-06-30 18:58:39 +02:00
Marc Brooks	2861df3c17	feat(ui): Add a clickable link to the header logo Might as well drive traffic to you :)	2025-06-12 13:28:31 -05:00