start moving openssl commands into openssl.js
This commit is contained in:
+5
-4
@@ -27,6 +27,7 @@ const assert = require('node:assert'),
|
||||
eventlog = require('./eventlog.js'),
|
||||
mailServer = require('./mailserver.js'),
|
||||
notifications = require('./notifications.js'),
|
||||
openssl = require('./openssl.js'),
|
||||
reverseProxy = require('./reverseproxy.js'),
|
||||
safe = require('safetydance'),
|
||||
tld = require('tldjs'),
|
||||
@@ -151,16 +152,16 @@ async function add(domain, data, auditSource) {
|
||||
|
||||
let fallbackCertificate;
|
||||
if (data.fallbackCertificate) {
|
||||
await reverseProxy.validateCertificate('test', domain, data.fallbackCertificate);
|
||||
await openssl.validateCertificate('test', domain, data.fallbackCertificate);
|
||||
fallbackCertificate = data.fallbackCertificate;
|
||||
} else {
|
||||
fallbackCertificate = await reverseProxy.generateFallbackCertificate(domain);
|
||||
fallbackCertificate = await openssl.generateCertificate(domain);
|
||||
}
|
||||
|
||||
let error = validateTlsConfig(tlsConfig, provider);
|
||||
if (error) throw error;
|
||||
|
||||
const dkimKey = await mailServer.generateDkimKey();
|
||||
const dkimKey = await openssl.generateDkimKey();
|
||||
|
||||
let dkimSelector = data.dkimSelector;
|
||||
if (!data.dkimSelector) {
|
||||
@@ -229,7 +230,7 @@ async function setConfig(domain, data, auditSource) {
|
||||
zoneName = domainObject.zoneName;
|
||||
}
|
||||
|
||||
if (fallbackCertificate) await reverseProxy.validateCertificate('test', domain, fallbackCertificate);
|
||||
if (fallbackCertificate) await openssl.validateCertificate('test', domain, fallbackCertificate);
|
||||
|
||||
const tlsConfigError = validateTlsConfig(tlsConfig, provider);
|
||||
if (tlsConfigError) throw tlsConfigError;
|
||||
|
||||
Reference in New Issue
Block a user