diff --git a/modules/main.js b/modules/main.js index 2c508de..b7e35cf 100644 --- a/modules/main.js +++ b/modules/main.js @@ -18,7 +18,7 @@ ------------------------------------------------------------------------- */ -const siteUrl = 'https://qmining.frylabs.net' // http(s)//asd.basd +let url = '' // http(s)//asd.basd const express = require('express') const bodyParser = require('body-parser') @@ -49,7 +49,7 @@ app.use(bodyParser.json({ app.get('/', function (req, res) { res.render('main/main', { - siteurl: siteUrl + siteurl: url }) }) @@ -65,5 +65,8 @@ app.post('*', function (req, res) { }) exports.app = app +exports.setup = (x) => { + url = x.url +} logger.Log('Main module started', logger.GetColor('yellow')) diff --git a/modules/old.js b/modules/old.js index f54b7c1..680d3bc 100644 --- a/modules/old.js +++ b/modules/old.js @@ -18,6 +18,7 @@ ------------------------------------------------------------------------- */ +let url = '' const express = require('express') const app = express() @@ -26,17 +27,20 @@ const logger = require('../utils/logger.js') // -------------------------------------------------------------- app.get('/', function (req, res) { - res.redirect('https://qmining.frylabs.net' + req.url) + res.redirect(url + req.url) }) app.get('*', function (req, res) { - res.redirect('https://qmining.frylabs.net' + req.url) + res.redirect(url + req.url) }) app.post('*', function (req, res) { - res.redirect('https://qmining.frylabs.net' + req.url) + res.redirect(url + req.url) }) exports.app = app +exports.setup = (x) => { + url = x.url +} logger.Log('Old module started', logger.GetColor('yellow')) diff --git a/modules/qmining.js b/modules/qmining.js index fa8b83d..6800e21 100644 --- a/modules/qmining.js +++ b/modules/qmining.js @@ -18,7 +18,7 @@ ------------------------------------------------------------------------- */ -const siteUrl = 'https://qmining.frylabs.net' // http(s)//asd.basd +let url = '' const express = require('express') const bodyParser = require('body-parser') @@ -60,7 +60,7 @@ app.get('/', function (req, res) { // req.hostname res.render('qmining/main', { - siteurl: siteUrl, + siteurl: url, qa: actions.ProcessQA() }) res.end() @@ -97,7 +97,7 @@ app.get('/legacy', function (req, res) { data: d, scount: scount, qcount: qcount, - siteurl: siteUrl + siteurl: url }) logger.LogReq(req) @@ -154,7 +154,7 @@ app.get('/greasy', function (req, res) { }) app.get('/install', function (req, res) { - res.redirect('http://qmining.frylabs.net/moodle-test-userscript/stable.user.js') + res.redirect(url + '/moodle-test-userscript/stable.user.js') res.end() logger.LogReq(req) }) @@ -225,5 +225,8 @@ app.post('*', function (req, res) { }) exports.app = app +exports.setup = (x) => { + url = x.url +} logger.Log('Qmining module started', logger.GetColor('yellow')) diff --git a/modules/stuff.js b/modules/stuff.js index 5113387..4e174eb 100644 --- a/modules/stuff.js +++ b/modules/stuff.js @@ -23,6 +23,7 @@ const bodyParser = require('body-parser') const busboy = require('connect-busboy') const fs = require('fs') const app = express() +let url = '' const logger = require('../utils/logger.js') // const utils = require('../utils/utils.js') @@ -91,7 +92,8 @@ app.get('/*', function (req, res) { res.render('stuff/folders', { folders: f, dirname: relPath, - prevDir + prevDir, + url }) } else { let fileStream = fs.createReadStream(curr) @@ -99,7 +101,8 @@ app.get('/*', function (req, res) { } } catch (e) { res.render('stuff/nofile', { - missingFile: curr + missingFile: curr, + url }) } }) @@ -118,5 +121,8 @@ app.post('*', function (req, res) { }) exports.app = app +exports.setup = (x) => { + url = x.url +} logger.Log('Stuff module started', logger.GetColor('yellow')) diff --git a/server.js b/server.js index c59d84b..362c910 100644 --- a/server.js +++ b/server.js @@ -68,7 +68,13 @@ const app = express() Object.keys(modules).forEach(function (k, i) { let x = modules[k] try { - x.app = require(x.path).app + let mod = require(x.path) + if (mod.setup) { + mod.setup({ + url: 'http://' + x.urls[0] // TODO http https or neither + }) + } + x.app = mod.app x.urls.forEach((url) => { app.use(vhost(url, x.app)) }) diff --git a/views/stuff/folders.ejs b/views/stuff/folders.ejs index 77013af..a153dfe 100644 --- a/views/stuff/folders.ejs +++ b/views/stuff/folders.ejs @@ -65,7 +65,7 @@ <%=dirname%> - " > Up one level + Up one level