diff options
| -rw-r--r-- | bucky/app/site.js | 8 | ||||
| -rw-r--r-- | package-lock.json | 95 | ||||
| -rw-r--r-- | package.json | 27 | ||||
| -rw-r--r-- | views/pages/index.ejs | 8 |
4 files changed, 64 insertions, 74 deletions
diff --git a/bucky/app/site.js b/bucky/app/site.js index 4272b24..3e41fcd 100644 --- a/bucky/app/site.js +++ b/bucky/app/site.js @@ -13,6 +13,10 @@ var favicon = require('serve-favicon') var passport = require('passport') var sessionstore = require('sessionstore') var session = require('express-session') +var redis = require('redis') +var RedisStore = require('connect-redis')(session) +var redisClient = redis.createClient() + var MongoStore = require('connect-mongo')(session); var upload = require('../util/upload') @@ -45,6 +49,9 @@ site.init = function(){ saveUninitialized: false, } if (!process.env.SESSIONS_IN_MEMORY) { + sessionSettings.store = + new RedisStore({ client: redisClient }) + /* sessionSettings.store = new MongoStore({ url: process.env.MONGODB_URL || 'mongodb://127.0.0.1:27107/buckySessionDb' // type: 'mongodb', @@ -54,6 +61,7 @@ site.init = function(){ // collectionName: 'sessions', // timeout: 10000, }) + */ } app.use(session(sessionSettings)) upload.init() diff --git a/package-lock.json b/package-lock.json index a3588fd..61fbc87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -590,11 +590,6 @@ } } }, - "bson": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz", - "integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg==" - }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -812,13 +807,10 @@ "typedarray": "^0.0.6" } }, - "connect-mongo": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.1.tgz", - "integrity": "sha512-ghBvVq0SA0SkTFsbAB8HdF1+uoHdFJICSlrTklNloMKXuRpX9IuVBnG0DlKnXBZSQI0Joyaq22cazsrV9+5g2A==", - "requires": { - "mongodb": "^2.0.36" - } + "connect-redis": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-5.0.0.tgz", + "integrity": "sha512-R4nTW5uXeG5s6zr/q4abmtcdloglZrL/A3cpa0JU0RLFJU4mTR553HUY8OZ0ngeySkGDclwQ5xmCcjjKkxdOSg==" }, "content-disposition": { "version": "0.5.2", @@ -1019,6 +1011,11 @@ } } }, + "denque": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", + "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -1097,11 +1094,6 @@ "iconv-lite": "~0.4.13" } }, - "es6-promise": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz", - "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q=" - }, "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", @@ -2818,25 +2810,6 @@ "moment": ">= 2.9.0" } }, - "mongodb": { - "version": "2.2.36", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.36.tgz", - "integrity": "sha512-P2SBLQ8Z0PVx71ngoXwo12+FiSfbNfGOClAao03/bant5DgLNkOPAck5IaJcEk4gKlQhDEURzfR3xuBG1/B+IA==", - "requires": { - "es6-promise": "3.2.1", - "mongodb-core": "2.1.20", - "readable-stream": "2.2.7" - } - }, - "mongodb-core": { - "version": "2.1.20", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.20.tgz", - "integrity": "sha512-IN57CX5/Q1bhDq6ShAR6gIv4koFsZP7L8WOK1S0lR0pVDQaScffSMV5jxubLsmZ7J+UdqmykKw4r9hG3XQEGgQ==", - "requires": { - "bson": "~1.0.4", - "require_optional": "~1.0.0" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -3640,6 +3613,35 @@ "esprima": "~1.0.4" } }, + "redis": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz", + "integrity": "sha512-PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==", + "requires": { + "denque": "^1.4.1", + "redis-commands": "^1.5.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0" + } + }, + "redis-commands": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz", + "integrity": "sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==" + }, + "redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=" + }, + "redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=", + "requires": { + "redis-errors": "^1.0.0" + } + }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", @@ -3702,22 +3704,6 @@ } } }, - "require_optional": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", - "requires": { - "resolve-from": "^2.0.0", - "semver": "^5.1.0" - }, - "dependencies": { - "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - } - } - }, "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", @@ -3735,11 +3721,6 @@ "global-modules": "^1.0.0" } }, - "resolve-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" - }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", diff --git a/package.json b/package.json index 8cdec9e..cad7d58 100644 --- a/package.json +++ b/package.json @@ -18,38 +18,39 @@ "license": "LNT", "dependencies": { "berkeleydb": "^0.2.1", - "body-parser": "^1.18.3", + "body-parser": "^1.19.0", "bookshelf": "^0.13.3", - "connect-mongo": "^2.0.1", - "cookie-parser": "^1.3.5", - "csurf": "^1.8.3", + "connect-mongo": "^2.0.3", + "connect-redis": "^5.0.0", + "cookie-parser": "^1.4.4", + "csurf": "^1.10.0", "dotenv": "^1.2.0", - "ejs": "^2.6.1", - "express": "^4.16.4", + "ejs": "^2.7.1", + "express": "^4.17.1", "express-json": "^1.0.0", - "express-session": "^1.11.3", + "express-session": "^1.16.2", "fs-readfile-promise": "^3.0.1", "knex": "^0.15.2", "knox": "^0.9.2", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "mock-express": "^1.3.0", "mongodb": "^2.2.36", - "multer": "^1.4.1", + "multer": "^1.4.2", "multiparty": "^4.2.1", "mysql2": "^0.15.8", "node-fetch": "^1.7.3", "node-uuid": "^1.4.8", "passport": "^0.3.0", "passport-local": "^1.0.0", - "pm2": "^3.5.1", + "redis": "^3.0.2", "serve-favicon": "^2.5.0", - "sessionstore": "^1.3.3", + "sessionstore": "^1.3.5", "skipper": "^0.8.7", "uglify-es": "^3.3.9", "unix-crypt-td-js": "^1.0.0", - "uuid": "^3.3.2" + "uuid": "^3.3.3" }, "devDependencies": { - "mime-types": "^2.1.21" + "mime-types": "^2.1.24" } } diff --git a/views/pages/index.ejs b/views/pages/index.ejs index e484fab..385ab1d 100644 --- a/views/pages/index.ejs +++ b/views/pages/index.ejs @@ -2,10 +2,6 @@ <div class="subtitle"></div> -<div id="content"> - <% include ../partials/threads %> -</div> - <div id="sidebar"> <% include ../partials/searchform %> <div class="bluebox alert"></div> @@ -14,4 +10,8 @@ <% include ../partials/hootbox %> </div> +<div id="content"> + <% include ../partials/threads %> +</div> + <% include ../partials/footer %> |