From ea970d0fa4a944ac09415a705362465e592b9e67 Mon Sep 17 00:00:00 2001 From: deityhub Date: Sun, 28 Nov 2021 10:58:59 +0100 Subject: [PATCH] switch to new greenlock package for oneuptime --- backend/.greenlockrc | 2 +- backend/backend/models/defaultManager.js | 4 +- backend/package-lock.json | 51 ++++++++++++++++++++++++ backend/package.json | 3 ++ backend/server.js | 6 +-- 5 files changed, 60 insertions(+), 6 deletions(-) diff --git a/backend/.greenlockrc b/backend/.greenlockrc index 77923e1c5c..cd9961a46b 100644 --- a/backend/.greenlockrc +++ b/backend/.greenlockrc @@ -1 +1 @@ -{"manager":"fyipe-gl-manager","configDir":"./greenlock.d"} \ No newline at end of file +{"manager":"oneuptime-gl-manager","configDir":"./greenlock.d"} \ No newline at end of file diff --git a/backend/backend/models/defaultManager.js b/backend/backend/models/defaultManager.js index b27e0be6af..d936365c12 100644 --- a/backend/backend/models/defaultManager.js +++ b/backend/backend/models/defaultManager.js @@ -12,14 +12,14 @@ const defaultManagerSchema = new Schema( store: { type: Object, default: { - module: 'fyipe-le-store', + module: 'oneuptime-le-store', }, }, challenges: { 'http-01': { type: Object, default: { - module: 'fyipe-acme-http-01', + module: 'oneuptime-acme-http-01', }, }, }, diff --git a/backend/package-lock.json b/backend/package-lock.json index 411fd7d879..51f6ea49a3 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -50,6 +50,9 @@ "node-html-parser": "^3.3.6", "nodemailer": "^6.6.2", "nodemailer-express-handlebars": "^4.0.0", + "oneuptime-acme-http-01": "^3.0.14223", + "oneuptime-gl-manager": "^3.0.14223", + "oneuptime-le-store": "^3.0.14223", "otplib": "^12.0.1", "p-iteration": "^1.1.8", "psl": "^1.8.0", @@ -6585,6 +6588,30 @@ "fn.name": "1.x.x" } }, + "node_modules/oneuptime-acme-http-01": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-acme-http-01/-/oneuptime-acme-http-01-3.0.14223.tgz", + "integrity": "sha512-6NhG4pGv2ZXt25KKsbjXv0PNnIhvneK7ASfFnSh9Dj2lZynJfcLbGawQQPBgSF8HnEx//+j1xB2hL7qAXXCGpw==", + "dependencies": { + "axios": "^0.21.1" + } + }, + "node_modules/oneuptime-gl-manager": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-gl-manager/-/oneuptime-gl-manager-3.0.14223.tgz", + "integrity": "sha512-WDeXCbhQE1nVXQ9rZysCyj+vZ/X6YHnmsyZ9e4ZQKtcIHlLkIFtWZGm69d35MFsmtKRZZRAwGd7NN5uU17WGCQ==", + "dependencies": { + "axios": "^0.21.1" + } + }, + "node_modules/oneuptime-le-store": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-le-store/-/oneuptime-le-store-3.0.14223.tgz", + "integrity": "sha512-YLo/fGkRLUPayDfmFIovScgEwfFjG/1pxumgEl9s2jiaU0QN6I3Yp8E3kwKjpgvNlhnSvSDg3wzXEut6ol0Vgw==", + "dependencies": { + "axios": "^0.21.1" + } + }, "node_modules/optional-require": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz", @@ -14498,6 +14525,30 @@ "fn.name": "1.x.x" } }, + "oneuptime-acme-http-01": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-acme-http-01/-/oneuptime-acme-http-01-3.0.14223.tgz", + "integrity": "sha512-6NhG4pGv2ZXt25KKsbjXv0PNnIhvneK7ASfFnSh9Dj2lZynJfcLbGawQQPBgSF8HnEx//+j1xB2hL7qAXXCGpw==", + "requires": { + "axios": "^0.21.1" + } + }, + "oneuptime-gl-manager": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-gl-manager/-/oneuptime-gl-manager-3.0.14223.tgz", + "integrity": "sha512-WDeXCbhQE1nVXQ9rZysCyj+vZ/X6YHnmsyZ9e4ZQKtcIHlLkIFtWZGm69d35MFsmtKRZZRAwGd7NN5uU17WGCQ==", + "requires": { + "axios": "^0.21.1" + } + }, + "oneuptime-le-store": { + "version": "3.0.14223", + "resolved": "https://registry.npmjs.org/oneuptime-le-store/-/oneuptime-le-store-3.0.14223.tgz", + "integrity": "sha512-YLo/fGkRLUPayDfmFIovScgEwfFjG/1pxumgEl9s2jiaU0QN6I3Yp8E3kwKjpgvNlhnSvSDg3wzXEut6ol0Vgw==", + "requires": { + "axios": "^0.21.1" + } + }, "optional-require": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz", diff --git a/backend/package.json b/backend/package.json index 8f349909e1..756828eefd 100755 --- a/backend/package.json +++ b/backend/package.json @@ -44,6 +44,9 @@ "node-html-parser": "^3.3.6", "nodemailer": "^6.6.2", "nodemailer-express-handlebars": "^4.0.0", + "oneuptime-acme-http-01": "^3.0.14223", + "oneuptime-gl-manager": "^3.0.14223", + "oneuptime-le-store": "^3.0.14223", "otplib": "^12.0.1", "p-iteration": "^1.1.8", "psl": "^1.8.0", diff --git a/backend/server.js b/backend/server.js index f6921223d4..29c66aaa73 100755 --- a/backend/server.js +++ b/backend/server.js @@ -394,7 +394,7 @@ const server = http.listen(app.get('port'), function() { mongoose.connection.on('connected', async () => { const greenlock = Gl.create({ - manager: 'fyipe-gl-manager', + manager: 'oneuptime-gl-manager', packageRoot: process.cwd(), maintainerEmail: 'certs@fyipe.com', staging: false, @@ -407,11 +407,11 @@ mongoose.connection.on('connected', async () => { }, challenges: { 'http-01': { - module: 'fyipe-acme-http-01', + module: 'oneuptime-acme-http-01', }, }, store: { - module: 'fyipe-le-store', + module: 'oneuptime-le-store', }, }); await greenlock.manager.defaults({