albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
MrFry
2020-01-28 15:52:36 +01:00
parent e349a6ee39 c1560a367d
commit 3ebbeb7673
5 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/main/main.js
View File

@@ -58,11 +58,11 @@ app.get('/', function (req, res) {
}) })
app.get('*', function (req, res) { app.get('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
app.post('*', function (req, res) { app.post('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
exports.app = app exports.app = app

1
modules/qmining/qmining.js
View File

@@ -366,7 +366,6 @@ app.get('/infos', function (req, res) {
if (req.query.motd) { if (req.query.motd) {
result.motd = motd result.motd = motd
} }
logger.LogReq(req)
res.json(result) res.json(result)
}) })

4
modules/sio/sio.js
View File

@@ -87,11 +87,11 @@ app.route('/fosuploader').post(function (req, res, next) {
}) })
}) })
app.get('*', function (req, res) { app.get('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
app.post('*', function (req, res) { app.post('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
exports.app = app exports.app = app

4
modules/stuff/stuff.js
View File

@@ -197,11 +197,11 @@ app.get('/*', function (req, res) {
// ----------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------
app.get('*', function (req, res) { app.get('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
app.post('*', function (req, res) { app.post('*', function (req, res) {
res.status(404).render('shared/404') res.status(404).render('404')
}) })
exports.app = app exports.app = app

29
server.js
View File

@@ -31,37 +31,12 @@ const http = require('http')
const https = require('https') const https = require('https')
const extraModulesFile = './extraModules.json' const extraModulesFile = './extraModules.json'
const modulesFile = './modules.json'
const loggableKeywords = [ const loggableKeywords = [
'user.js' 'user.js'
] ]
let modules = { let modules = JSON.parse(utils.ReadFile(modulesFile))
qmining: {
path: './modules/qmining/qmining.js',
name: 'qmining',
urls: [ 'qmining.frylabs.net', 'localhost' ]
},
main: {
path: './modules/main/main.js',
name: 'main',
urls: [ 'frylabs.net', 'www.frylabs.net' ]
},
sio: {
path: './modules/sio/sio.js',
name: 'sio',
urls: [ 'sio.frylabs.net' ]
},
stuff: {
path: './modules/stuff/stuff.js',
name: 'stuff',
urls: [ 'stuff.frylabs.net' ]
},
old: {
path: './modules/old/old.js',
name: 'old',
urls: [ 'qmining.tk', 'www.qmining.tk' ]
}
}
try { try {
if (utils.FileExists(extraModulesFile)) { if (utils.FileExists(extraModulesFile)) {