more changes to make possible to run without nginx for dev purposes

merge-requests/208/head
fatchan 5 years ago
parent 2b8e60a729
commit 74e267cc10
  1. 1
      gulp/res/js/socket.io.js
  2. 2
      helpers/processip.js
  3. 3
      server.js
  4. 2
      views/includes/navbar.pug

@ -1 +0,0 @@
/home/tom/jschan/node_modules/socket.io-client/dist/socket.io.js

@ -4,7 +4,7 @@ const { ipHashSecret } = require(__dirname+'/../configs/main.json')
, { createHash } = require('crypto');
module.exports = (req, res, next) => {
const ip = req.headers['x-real-ip']; //need to consider forwarded-for, etc here and in nginx
const ip = req.headers['x-real-ip'] || req.connection.remoteAddress; //need to consider forwarded-for, etc here and in nginx
const delimiter = ip.includes('.') ? '.' : ':';
let split = ip.split(delimiter);
res.locals.ip = {

@ -85,6 +85,9 @@ const express = require('express')
// routes
app.use('/forms', require(__dirname+'/controllers/forms.js'));
app.use('/', require(__dirname+'/controllers/pages.js'));
if (!production) {
app.use(express.static(__dirname+'/static'));
}
//404 catchall
app.get('*', (req, res) => {

@ -1,5 +1,5 @@
nav.navbar#top
a.nav-item(href='/') Home
a.nav-item(href='/index.html') Home
a.nav-item(href='/news.html') News
a.nav-item(href='/boards.html') Boards
a.nav-item(href=`/${board ? board._id+'/manage/reports' : 'globalmanage/reports'}.html`) Manage

Loading…
Cancel
Save