Update SubsystemCLI.getEngineConfig()

The SubsystemCLI.getEngineConfig() has been updated to use the proper subsystem conf folder instead of the backward compatibility link.
dogtagpki · Nov 16, 2023 · ae6e19e · ae6e19e
1 parent e94640d
commit ae6e19e
Showing 1 changed file with 3 additions and 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
@@ -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);