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 'master' of https://gitlab.com/YourFriendlyNeighborhoodDealer/question-node-server

Browse source
This commit is contained in:
YourFriendlyNeighborhoodDealer 2019-03-06 09:21:23 +01:00
commit afe09a9e8e
2 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
server.js
View file

@ -18,7 +18,7 @@
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
const startHTTPS = false; const startHTTPS = true;
const siteUrl = "https://qmining.tk"; // http(s)//asd.basd const siteUrl = "https://qmining.tk"; // http(s)//asd.basd
const ircURL = "https://kiwiirc.com/nextclient/irc.sub.fm/#qmining"; const ircURL = "https://kiwiirc.com/nextclient/irc.sub.fm/#qmining";
@ -48,12 +48,13 @@ const logFile = "stats/logs";
const allLogFile = "/nlogs/log"; const allLogFile = "/nlogs/log";
// https://certbot.eff.org/ // https://certbot.eff.org/
const privkeyFile = "/etc/letsencrypt/live/questionmining.tk/privkey.pem"; const privkeyFile = "/etc/letsencrypt/live/qmining.tk/privkey.pem";
const fullchainFile = "/etc/letsencrypt/live/questionmining.tk/fullchain.pem"; const fullchainFile = "/etc/letsencrypt/live/qmining.tk/fullchain.pem";
const chainFile = "/etc/letsencrypt/live/questionmining.tk/chain.pem"; const chainFile = "/etc/letsencrypt/live/qmining.tk/chain.pem";
var certsLoaded = false; var certsLoaded = false;
if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(chainFile)) { if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(chainFile)) {
try {
const key = fs.readFileSync(privkeyFile, "utf8"); const key = fs.readFileSync(privkeyFile, "utf8");
const cert = fs.readFileSync(fullchainFile, "utf8"); const cert = fs.readFileSync(fullchainFile, "utf8");
const ca = fs.readFileSync(chainFile, "utf8"); const ca = fs.readFileSync(chainFile, "utf8");
@ -63,6 +64,10 @@ if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFil
ca: ca ca: ca
}; };
certsLoaded = true; certsLoaded = true;
} catch (e) {
logger.Log("Error loading cert files!", logger.GetColor("redbg"));
}
} }
const port = 8080; const port = 8080;
@ -73,13 +78,6 @@ var highlights = ["public", "static", "manual", "isgetting", "postfeedback",
]; ];
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
//app.all('*', function(req, res, next) {
// if(req.secure) {
// next();
// } else {
// res.redirect('https://' + req.hostname + req.url);
// }
//});
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.on('finish', function() { res.on('finish', function() {
Log(req, true, res.statusCode); Log(req, true, res.statusCode);
@ -140,10 +138,15 @@ app.get('/legacy', function(req, res) {
var f = utils.ReadFile(dataFile); var f = utils.ReadFile(dataFile);
var d = actions.LoadJSON(f); var d = actions.LoadJSON(f);
var raw = d.toString().split("\n"); let qcount = 0;
for (let i = 0; i < d.length; i++)
qcount += d.Subjects[i].length;
let scount = d.length;
res.render('alldata', { res.render('alldata', {
data: d data: d,
scount: scount,
qcount: qcount
}); });
Log(req); Log(req);

2
views/alldata.ejs
View file

@ -59,6 +59,8 @@
<center> <center>
<h2> <h2>
Ennek az oldalnak a tartalma dinamikusan frissül minden beküldött kérdés után Ennek az oldalnak a tartalma dinamikusan frissül minden beküldött kérdés után
</br>
<%=scount%> tárgy és <%=qcount%> kérdés
</h2> </h2>
</center> </center>
<% for (var i = 0; i < data.Subjects.length; i++) { %> <% for (var i = 0; i < data.Subjects.length; i++) { %>