From 15073a357c11f8322096d574343ab551ad5fada2 Mon Sep 17 00:00:00 2001 From: William Xiang Date: Thu, 14 Nov 2024 14:37:45 -0500 Subject: [PATCH] change to use the actual custom certificate file when it exists Signed-off-by: William Xiang --- .../com/github/ibm/mapepire/certstuff/ServerCertGetter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/ibm/mapepire/certstuff/ServerCertGetter.java b/src/main/java/com/github/ibm/mapepire/certstuff/ServerCertGetter.java index 0c5d959..9f292d9 100644 --- a/src/main/java/com/github/ibm/mapepire/certstuff/ServerCertGetter.java +++ b/src/main/java/com/github/ibm/mapepire/certstuff/ServerCertGetter.java @@ -87,8 +87,8 @@ private File findLetsEncryptCertDir() { public ServerCertInfo get() throws IOException, InterruptedException { if (m_userCertFile.isFile()) { - Tracer.info("Reusing user-defined server certificate in " + m_defaultCertFile.getAbsolutePath()); - return new ServerCertJKS(m_defaultCertFile, StoreDefaults.getStorePass(), StoreDefaults.getKeyPass(), + Tracer.info("Reusing user-defined server certificate in " + m_userCertFile.getAbsolutePath()); + return new ServerCertJKS(m_userCertFile, StoreDefaults.getStorePass(), StoreDefaults.getKeyPass(), StoreDefaults.getAlias()); } else if (null != m_letsEncrypt) { Tracer.info("Using LetsEncrypt certificate file " + m_letsEncrypt.getKeyStoreFile().getAbsolutePath());