misc: corrected hsm placement

backend/src/ee/services/hsm/hsm-fns.ts

@@ -84,7 +84,7 @@ export const isHsmActiveAndEnabled = async ({
 
   rootKmsConfigEncryptionStrategy = (rootKmsConfig?.encryptionStrategy || null) as RootKeyEncryptionStrategy | null;
   if (
-    rootKmsConfigEncryptionStrategy === RootKeyEncryptionStrategy.HSM &&
+    (rootKmsConfigEncryptionStrategy === RootKeyEncryptionStrategy.HSM || isHsmConfigured) &&
     licenseService &&
     !licenseService.onPremFeatures.hsm
   ) {

backend/src/server/routes/index.ts

@@ -2300,9 +2300,6 @@ export const registerRoutes = async (
   // setup the communication with license key server
   await licenseService.init();
 
-  const completeServerInitialization = async () => {
-    await superAdminService.initServerCfg();
-
   // If FIPS is enabled, we check to ensure that the users license includes FIPS mode.
   crypto.verifyFipsLicense(licenseService);
 
@@ -2330,6 +2327,9 @@ export const registerRoutes = async (
     }
   }
 
+  const completeServerInitialization = async () => {
+    await superAdminService.initServerCfg();
+
     await telemetryQueue.startTelemetryCheck();
     await telemetryQueue.startAggregatedEventsJob();
     await dailyResourceCleanUp.init();