From 1f786699d20f1423a6e99aaaed1d062231ef4697 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Sun, 28 Apr 2024 13:16:53 +0100 Subject: [PATCH] Update GreenlockUtil configuration paths --- App/FeatureSet/Workers/.greenlockrc | 1 - CommonServer/Utils/Greenlock/Greenlock.ts | 12 ++++++------ CommonServer/Utils/Greenlock/greenlockrc | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 App/FeatureSet/Workers/.greenlockrc create mode 100644 CommonServer/Utils/Greenlock/greenlockrc diff --git a/App/FeatureSet/Workers/.greenlockrc b/App/FeatureSet/Workers/.greenlockrc deleted file mode 100644 index 08146cea7c..0000000000 --- a/App/FeatureSet/Workers/.greenlockrc +++ /dev/null @@ -1 +0,0 @@ -{"manager":"/usr/src/app/FeatureSet/Workers/Utils/Greenlock/Manager.ts","configDir":"./greenlock.d"} \ No newline at end of file diff --git a/CommonServer/Utils/Greenlock/Greenlock.ts b/CommonServer/Utils/Greenlock/Greenlock.ts index fdc6a394f6..2a10a3fa49 100644 --- a/CommonServer/Utils/Greenlock/Greenlock.ts +++ b/CommonServer/Utils/Greenlock/Greenlock.ts @@ -10,16 +10,16 @@ import Greenlock from 'greenlock'; export default class GreenlockUtil { private static greenLockInstance: any = null; - public static getGreenlockInstance(): any { + private static getGreenlockInstance(): any { if (this.greenLockInstance) { return this.greenLockInstance; } this.greenLockInstance = Greenlock.create({ - configFile: '/usr/src/Common/FeatureSet/Workers/greenlockrc', - packageRoot: `/usr/src/app/greenlock`, + configFile: '//usr/src/CommonServer/Utils/Greenlock/greenlockrc', + packageRoot: `/usr/src/CommonServer/greenlock`, manager: - '/usr/src/app/FeatureSet/Workers/Utils/Greenlock/Manager.ts', + '/usr/src/CommonServer/Utils/Greenlock/Manager.ts', approveDomains: async (opts: any) => { const domain: StatusPageDomain | null = await StatusPageDomainService.findOneBy({ @@ -44,7 +44,7 @@ export default class GreenlockUtil { return opts; // or Promise.resolve(opts); }, store: { - module: '/usr/src/app/FeatureSet/Workers/Utils/Greenlock/Store.ts', + module: '/usr/src/CommonServer/Utils/Greenlock/Store.ts', }, // Staging for testing environments // staging: IsDevelopment, @@ -68,7 +68,7 @@ export default class GreenlockUtil { agreeToTerms: true, challenges: { 'http-01': { - module: '/usr/src/app/FeatureSet/Workers/Utils/Greenlock/HttpChallenge.ts', + module: '/usr/src/CommonServer/Utils/Greenlock/HttpChallenge.ts', }, }, }); diff --git a/CommonServer/Utils/Greenlock/greenlockrc b/CommonServer/Utils/Greenlock/greenlockrc new file mode 100644 index 0000000000..ec97048a5f --- /dev/null +++ b/CommonServer/Utils/Greenlock/greenlockrc @@ -0,0 +1 @@ +{"manager":"/usr/src/CommonServer/Utils/Greenlock/Manager.ts","configDir":"./greenlock.d"} \ No newline at end of file