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 Projects Releases Packages Wiki Activity Actions

Merge branch 'vhosts' of https://gitlab.com/YourFriendlyNeighborhoodDealer/question-node-server into vhosts

Browse source
This commit is contained in:
YourFriendlyNeighborhoodDealer 2019-08-14 12:35:29 +02:00
commit dd6e16e15d
7 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/sio.js
View file

@ -31,7 +31,7 @@ const utils = require('../utils/utils.js')
const stat = require('../utils/stat.js') const stat = require('../utils/stat.js')
stat.Load() stat.Load()
const uloadFiles = '../public/f' const uloadFiles = './public/f'
app.set('view engine', 'ejs') app.set('view engine', 'ejs')
app.use(function (req, res, next) { app.use(function (req, res, next) {

4
modules/stuff.js
View file

@ -30,7 +30,7 @@ const logger = require('../utils/logger.js')
const stat = require('../utils/stat.js') const stat = require('../utils/stat.js')
stat.Load() stat.Load()
const listedFiles = '../public/files' const listedFiles = './public/files'
app.set('view engine', 'ejs') app.set('view engine', 'ejs')
app.use(function (req, res, next) { app.use(function (req, res, next) {
@ -121,4 +121,4 @@ app.post('*', function (req, res) {
exports.app = app exports.app = app
logger.Log('Main module started', logger.GetColor('yellow')) logger.Log('Stuff module started', logger.GetColor('yellow'))

2
server.js
View file

@ -25,6 +25,7 @@ const logger = require('./utils/logger.js')
const qmining = require('./modules/qmining.js').app const qmining = require('./modules/qmining.js').app
const main = require('./modules/main.js').app const main = require('./modules/main.js').app
const sio = require('./modules/sio.js').app const sio = require('./modules/sio.js').app
const stuff = require('./modules/stuff.js').app
const port = 8080 const port = 8080
@ -54,6 +55,7 @@ const port = 8080
express() express()
.use(vhost('qmining.frylabs.net', qmining)) .use(vhost('qmining.frylabs.net', qmining))
.use(vhost('sio.frylabs.net', sio)) .use(vhost('sio.frylabs.net', sio))
.use(vhost('stuff.frylabs.net', stuff))
.use(vhost('frylabs.net', main)) .use(vhost('frylabs.net', main))
.use(vhost('qmining.tk', qmining)) .use(vhost('qmining.tk', qmining))
.listen(port) .listen(port)

12
utils/actions.js
View file

@ -25,12 +25,12 @@ module.exports = {
ProcessQA: ProcessQA ProcessQA: ProcessQA
} }
const staticFile = '../public/data/static' const staticFile = './public/data/static'
const dataFile = '../public/data.json' const dataFile = './public/data.json'
const recDataFile = '../stats/recdata' const recDataFile = './stats/recdata'
const versionFile = '../public/version' const versionFile = './public/version'
const motdFile = '../public/motd' const motdFile = './public/motd'
const qaFile = '../public/qa' const qaFile = './public/qa'
var logger = require('../utils/logger.js') var logger = require('../utils/logger.js')
var utils = require('../utils/utils.js') var utils = require('../utils/utils.js')

4
utils/logger.js
View file

@ -28,8 +28,8 @@ module.exports = {
const DELIM = '|' const DELIM = '|'
var utils = require('../utils/utils.js') var utils = require('../utils/utils.js')
const nlogFile = '../stats/nlogs' const nlogFile = './stats/nlogs'
const locLogFile = '../stats/logs' const locLogFile = './stats/logs'
const logFile = '/nlogs/nlogs' const logFile = '/nlogs/nlogs'
const allLogFile = '/nlogs/log' const allLogFile = '/nlogs/log'

4
utils/stat.js
View file

@ -26,8 +26,8 @@ module.exports = {
var utils = require('../utils/utils.js') var utils = require('../utils/utils.js')
var logger = require('../utils/logger.js') var logger = require('../utils/logger.js')
const statFile = '../stats/stats' const statFile = 'stats/stats'
const vStatFile = '../stats/vstats' const vStatFile = 'stats/vstats'
const writeInterval = 10 const writeInterval = 10
var data = {} var data = {}

8
utils/utils.js
View file

@ -14,10 +14,10 @@ var fs = require('fs')
var logger = require('../utils/logger.js') var logger = require('../utils/logger.js')
const recievedFile = '../stats/recieved' const recievedFile = './stats/recieved'
const manFile = '../public/man.html' const manFile = './public/man.html'
const logFile = '../stats/logs' const logFile = './stats/logs'
const dataFile = '../public/data.json' const dataFile = './public/data.json'
function ReadFile (name) { function ReadFile (name) {
if (!FileExists(name)) { throw 'No such file: ' + name } if (!FileExists(name)) { throw 'No such file: ' + name }