mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Added extra modules loading
This commit is contained in:
22
server.js
22
server.js
@@ -27,10 +27,11 @@ const vhost = require('vhost')
|
|||||||
const logger = require('./utils/logger.js')
|
const logger = require('./utils/logger.js')
|
||||||
logger.Load()
|
logger.Load()
|
||||||
const utils = require('./utils/utils.js')
|
const utils = require('./utils/utils.js')
|
||||||
const fs = require('fs')
|
|
||||||
const http = require('http')
|
const http = require('http')
|
||||||
const https = require('https')
|
const https = require('https')
|
||||||
|
|
||||||
|
const extraModulesFile = './extraModules.json'
|
||||||
|
|
||||||
const loggableKeywords = [
|
const loggableKeywords = [
|
||||||
'user.js'
|
'user.js'
|
||||||
]
|
]
|
||||||
@@ -62,6 +63,19 @@ let modules = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (utils.FileExists(extraModulesFile)) {
|
||||||
|
const extraModules = JSON.parse(utils.ReadFile(extraModulesFile))
|
||||||
|
modules = {
|
||||||
|
...extraModules,
|
||||||
|
...modules
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
logger.Log('Failed to read extra modules file')
|
||||||
|
console.log(e)
|
||||||
|
}
|
||||||
|
|
||||||
const app = express()
|
const app = express()
|
||||||
|
|
||||||
app.use(function (req, res, next) {
|
app.use(function (req, res, next) {
|
||||||
@@ -107,9 +121,9 @@ var certsLoaded = false
|
|||||||
if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(
|
if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(
|
||||||
chainFile)) {
|
chainFile)) {
|
||||||
try {
|
try {
|
||||||
const key = fs.readFileSync(privkeyFile, 'utf8')
|
const key = utils.ReadFile(privkeyFile)
|
||||||
const cert = fs.readFileSync(fullchainFile, 'utf8')
|
const cert = utils.ReadFile(fullchainFile)
|
||||||
const ca = fs.readFileSync(chainFile, 'utf8')
|
const ca = utils.ReadFile(chainFile)
|
||||||
var certs = {
|
var certs = {
|
||||||
key: key,
|
key: key,
|
||||||
cert: cert,
|
cert: cert,
|
||||||
|
Reference in New Issue
Block a user