From ae6e19e634e30e29133bda77ca98226a3a85e140 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 16 Nov 2023 13:17:08 -0600
Subject: [PATCH] Update SubsystemCLI.getEngineConfig()

The SubsystemCLI.getEngineConfig() has been updated to use
the proper subsystem conf folder instead of the backward
compatibility link.
---
 .../main/java/org/dogtagpki/server/cli/SubsystemCLI.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/server/src/main/java/org/dogtagpki/server/cli/SubsystemCLI.java b/base/server/src/main/java/org/dogtagpki/server/cli/SubsystemCLI.java
index e0c37ecb4cf..2a11b4f0a71 100644
--- a/base/server/src/main/java/org/dogtagpki/server/cli/SubsystemCLI.java
+++ b/base/server/src/main/java/org/dogtagpki/server/cli/SubsystemCLI.java
@@ -43,9 +43,9 @@ protected void initializeTomcatJSS() throws Exception {
 
     protected EngineConfig getEngineConfig(String subsystem) throws Exception {
 
-        String instanceDir = CMS.getInstanceDir();
-        String configDir = instanceDir + File.separator + subsystem;
-        String configFile = configDir + File.separator + "conf" + File.separator + CMS.CONFIG_FILE;
+        // use subsystem conf folder: /var/lib/pki/<instance>/conf/<subsystem>
+        String confDir = CMS.getInstanceDir() + File.separator + "conf" + File.separator + subsystem;
+        String configFile = confDir + File.separator + CMS.CONFIG_FILE;
         logger.debug("{}: Loading {}", getClass().getSimpleName(), configFile);
 
         ConfigStorage storage = new FileConfigStorage(configFile);