From a6def92a6f781d78618c4a174fa8cda001d45cf0 Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Thu, 16 Oct 2025 06:57:51 -0700 Subject: [PATCH] feat: supports additional cert paths --- internal/support/cli/certs.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/internal/support/cli/certs.go b/internal/support/cli/certs.go index 507f0126..039aa5ae 100644 --- a/internal/support/cli/certs.go +++ b/internal/support/cli/certs.go @@ -9,12 +9,22 @@ import ( ) func ReadCertificates(certs embed.FS) (tls.Certificate, error) { - if pair, err := tls.LoadX509KeyPair("dozzle_cert.pem", "dozzle_key.pem"); err == nil { - log.Info().Msg("Loaded custom dozzle certificate and key") - return pair, nil - } else { - if !os.IsNotExist(err) { - log.Fatal().Err(err).Msg("Failed to load custom dozzle certificate and key. Stopping...") + // Try multiple certificate paths in order of preference + certPaths := []struct { + cert string + key string + }{ + {"dozzle_cert.pem", "dozzle_key.pem"}, + {"/dozzle-cert.pem", "/dozzle-key.pem"}, + {"/certs/dozzle-cert.pem", "/certs/dozzle-key.pem"}, + } + + for _, paths := range certPaths { + if pair, err := tls.LoadX509KeyPair(paths.cert, paths.key); err == nil { + log.Info().Str("cert", paths.cert).Str("key", paths.key).Msg("Loaded custom dozzle certificate and key") + return pair, nil + } else if !os.IsNotExist(err) { + log.Fatal().Err(err).Str("cert", paths.cert).Str("key", paths.key).Msg("Failed to load custom dozzle certificate and key. Stopping...") } }