diff --git a/modules/api/api.js b/modules/api/api.js index b6165da..94a7ca1 100644 --- a/modules/api/api.js +++ b/modules/api/api.js @@ -98,12 +98,6 @@ app.post('/postfeedback', function (req, res) { res.end() }) -app.get('/servergit', function (req, res) { - res.redirect('https://gitlab.com/MrFry/mrfrys-node-server') - res.end() - logger.LogReq(req) -}) - function UploadFile (req, res, path, next) { var fstream req.pipe(req.busboy) @@ -140,6 +134,13 @@ app.route('/badtestsender').post(function (req, res, next) { logger.LogReq(req) }) +app.get('/allqr.txt', function (req, res) { + res.set('Content-Type', 'text/plain') + res.send(data.toString()) + res.end() + logger.LogReq(req) +}) + // ------------------------------------------------------------------------------------------- // API diff --git a/modules/qmining/qmining.js b/modules/qmining/qmining.js index c32c4ce..2984725 100644 --- a/modules/qmining/qmining.js +++ b/modules/qmining/qmining.js @@ -41,6 +41,7 @@ app.set('views', [ './sharedViews' ]) app.use(express.static('modules/qmining/public')) +app.use(express.static('public')) app.use(busboy({ limits: { fileSize: 10000 * 1024 * 1024 @@ -70,6 +71,10 @@ const simpleRedirects = [ from: '/install', to: url + '/moodle-test-userscript/stable.user.js?install' }, + { + from: '/servergit', + to: 'https://gitlab.com/MrFry/mrfrys-node-server' + }, { from: '/scriptgit', to: 'https://gitlab.com/MrFry/moodle-test-userscript' @@ -94,6 +99,14 @@ const simpleRedirects = [ from: '/legacy', to: '/allQuestions.html' }, + { + from: '/allqr', + to: 'http://api.frylabs.net/allqr.txt' + }, + { + from: '/allqr.txt', + to: 'http://api.frylabs.net/allqr.txt' + }, { from: '/infos', to: 'http://api.frylabs.net/infos?version=true&motd=true&subjinfo=true' diff --git a/public/moodle-test-userscript b/public/moodle-test-userscript index f69734e..fe74436 160000 --- a/public/moodle-test-userscript +++ b/public/moodle-test-userscript @@ -1 +1 @@ -Subproject commit f69734e571ec02d6c7de6ecabe8ca83c8bc62623 +Subproject commit fe74436ab119a31fdb35f7a3bbae50a572b0fb21 diff --git a/server.js b/server.js index 0a2f902..47fefdf 100755 --- a/server.js +++ b/server.js @@ -19,7 +19,7 @@ ------------------------------------------------------------------------- */ const startHTTPS = true -const port = 8080 +const port = 80 const httpsport = 5001 const express = require('express')