mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 20:27:43 +00:00
misc: corrected hsm placement
This commit is contained in:
@@ -84,7 +84,7 @@ export const isHsmActiveAndEnabled = async ({
|
|||||||
|
|
||||||
rootKmsConfigEncryptionStrategy = (rootKmsConfig?.encryptionStrategy || null) as RootKeyEncryptionStrategy | null;
|
rootKmsConfigEncryptionStrategy = (rootKmsConfig?.encryptionStrategy || null) as RootKeyEncryptionStrategy | null;
|
||||||
if (
|
if (
|
||||||
rootKmsConfigEncryptionStrategy === RootKeyEncryptionStrategy.HSM &&
|
(rootKmsConfigEncryptionStrategy === RootKeyEncryptionStrategy.HSM || isHsmConfigured) &&
|
||||||
licenseService &&
|
licenseService &&
|
||||||
!licenseService.onPremFeatures.hsm
|
!licenseService.onPremFeatures.hsm
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -2300,9 +2300,6 @@ export const registerRoutes = async (
|
|||||||
// setup the communication with license key server
|
// setup the communication with license key server
|
||||||
await licenseService.init();
|
await licenseService.init();
|
||||||
|
|
||||||
const completeServerInitialization = async () => {
|
|
||||||
await superAdminService.initServerCfg();
|
|
||||||
|
|
||||||
// If FIPS is enabled, we check to ensure that the users license includes FIPS mode.
|
// If FIPS is enabled, we check to ensure that the users license includes FIPS mode.
|
||||||
crypto.verifyFipsLicense(licenseService);
|
crypto.verifyFipsLicense(licenseService);
|
||||||
|
|
||||||
@@ -2330,6 +2327,9 @@ export const registerRoutes = async (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const completeServerInitialization = async () => {
|
||||||
|
await superAdminService.initServerCfg();
|
||||||
|
|
||||||
await telemetryQueue.startTelemetryCheck();
|
await telemetryQueue.startTelemetryCheck();
|
||||||
await telemetryQueue.startAggregatedEventsJob();
|
await telemetryQueue.startAggregatedEventsJob();
|
||||||
await dailyResourceCleanUp.init();
|
await dailyResourceCleanUp.init();
|
||||||
|
|||||||
Reference in New Issue
Block a user