Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-30 11:18:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

install script + patching up integration with install wizard

Browse Source
This commit is contained in:
Julian Lam
2013-05-27 14:02:57 -04:00
parent 5d7ec10aae
commit 88bf9425db
19 changed files with 177 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/meta.js
View File

@@ -1,5 +1,4 @@
var config = require('../config.js'),
utils = require('./../public/src/utils.js'),
var utils = require('./../public/src/utils.js'),
RDB = require('./redis.js'),
async = require('async');

3
src/notifications.js
View File

@@ -1,5 +1,4 @@
var config = require('../config.js'),
RDB = require('./redis.js'),
var RDB = require('./redis.js'),
async = require('async'),
utils = require('../public/src/utils.js');

5
src/postTools.js
View File

@@ -2,7 +2,6 @@ var RDB = require('./redis.js'),
posts = require('./posts.js'),
threadTools = require('./threadTools.js'),
user = require('./user.js'),
config = require('../config.js'),
async = require('async'),
marked = require('marked');
@@ -35,8 +34,8 @@ marked.setOptions({
// DRY fail in threadTools.
user.getUserField(uid, 'reputation', function(reputation) {
next(null, reputation >= config.privilege_thresholds.manage_content);
});
next(null, reputation >= global.config['privileges:manage_content']);
});
}
async.parallel([getThreadPrivileges, isOwnPost, hasEnoughRep], function(err, results) {

1
src/posts.js
View File

@@ -4,7 +4,6 @@ var RDB = require('./redis.js'),
user = require('./user.js'),
topics = require('./topics.js'),
favourites = require('./favourites.js'),
config = require('../config.js'),
threadTools = require('./threadTools.js'),
async = require('async');

4
src/redis.js
View File

@@ -3,11 +3,9 @@
ERROR_LOGS = true,
redis = require('redis'),
config = require('../config.js'),
utils = require('./../public/src/utils.js');
RedisDB.exports = redis.createClient(config.redis.port, config.redis.host, config.redis.options);
RedisDB.exports = redis.createClient(global.config.redis.port, global.config.redis.host);
RedisDB.exports.handle = function(error) {
if (error !== null) {

25
src/routes/authentication.js
View File

@@ -1,5 +1,4 @@
(function(Auth) {
var passport = require('passport'),
passportLocal = require('passport-local').Strategy,
passportTwitter = require('passport-twitter').Strategy,
@@ -7,11 +6,7 @@
passportFacebook = require('passport-facebook').Strategy,
login_strategies = [],
user_module = require('./../user.js'),
config = require('./../../config.js');
user_module = require('./../user.js');
passport.use(new passportLocal(function(user, password, next) {
user_module.loginViaLocal(user, password, function(login) {
@@ -20,10 +15,10 @@
});
}));
if (config.twitter && config.twitter.key && config.twitter.key.length > 0 && config.twitter.secret.length > 0) {
if (global.config['social:twitter:key'] && global.config['social:twitter:secret']) {
passport.use(new passportTwitter({
consumerKey: config.twitter.key,
consumerSecret: config.twitter.secret,
consumerKey: global.config['social:twitter:key'],
consumerSecret: global.config['social:twitter:secret'],
callbackURL: config.url + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) {
user_module.loginViaTwitter(profile.id, profile.username, function(err, user) {
@@ -35,10 +30,10 @@
login_strategies.push('twitter');
}
if (config.google && config.google.id.length > 0 && config.google.secret.length > 0) {
if (global.config['social:google:id'] && global.config['social:google:secret']) {
passport.use(new passportGoogle({
clientID: config.google.id,
clientSecret: config.google.secret,
clientID: global.config['social:google:id'],
clientSecret: global.config['social:google:secret'],
callbackURL: config.url + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) {
user_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
@@ -50,10 +45,10 @@
login_strategies.push('google');
}
if (config.facebook && config.facebook.app_id.length > 0 && config.facebook.secret.length > 0) {
if (global.config['social:facebook:app_id'] && global.config['social:facebook:secret']) {
passport.use(new passportFacebook({
clientID: config.facebook.app_id,
clientSecret: config.facebook.secret,
clientID: global.config['social:facebook:app_id'],
clientSecret: global.config['social:facebook:secret'],
callbackURL: config.url + 'auth/facebook/callback'
}, function(accessToken, refreshToken, profile, done) {
user_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {

3
src/routes/user.js
View File

@@ -1,12 +1,9 @@
var user = require('./../user.js'),
fs = require('fs'),
utils = require('./../../public/src/utils.js'),
config = require('../../config.js'),
marked = require('marked');
(function(User) {
User.create_routes = function(app) {

3
src/threadTools.js
View File

@@ -2,7 +2,6 @@ var RDB = require('./redis.js'),
topics = require('./topics.js'),
categories = require('./categories.js'),
user = require('./user.js'),
config = require('../config.js'),
async = require('async');
@@ -23,7 +22,7 @@ var RDB = require('./redis.js'),
// DRY fail in postTools
user.getUserField(uid, 'reputation', function(reputation) {
next(null, reputation >= config.privilege_thresholds.manage_thread);
next(null, reputation >= global.config['privileges:manage_topic']);
});
}

1
src/topics.js
View File

@@ -3,7 +3,6 @@ var RDB = require('./redis.js')
posts = require('./posts.js'),
utils = require('./../public/src/utils.js'),
user = require('./user.js'),
config = require('../config.js'),
categories = require('./categories.js'),
posts = require('./posts.js'),
marked = require('marked'),

3
src/user.js
View File

@@ -1,5 +1,4 @@
var config = require('../config.js'),
utils = require('./../public/src/utils.js'),
var utils = require('./../public/src/utils.js'),
RDB = require('./redis.js'),
crypto = require('crypto'),
emailjs = require('emailjs'),

5
src/webserver.js
View File

@@ -3,9 +3,8 @@ var express = require('express'),
server = require('http').createServer(WebServer),
RedisStore = require('connect-redis')(express),
path = require('path'),
config = require('../config.js'),
redis = require('redis'),
redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
redisServer = redis.createClient(global.config.redis.port, global.config.redis.host),
marked = require('marked'),
utils = require('../public/src/utils.js'),
fs = require('fs'),
@@ -36,7 +35,7 @@ var express = require('express'),
client: redisServer,
ttl: 60*60*24*14
}),
secret: config.secret,
secret: global.config.secret,
key: 'express.sid'
}));

18
src/websockets.js
View File

@@ -2,7 +2,6 @@
var SocketIO = require('socket.io').listen(global.server, { log:false }),
cookie = require('cookie'),
connect = require('connect'),
config = require('../config.js'),
user = require('./user.js'),
posts = require('./posts.js'),
favourites = require('./favourites.js'),
@@ -26,7 +25,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
io.set('authorization', function(handshakeData, accept) {
if (handshakeData.headers.cookie) {
handshakeData.cookie = cookie.parse(handshakeData.headers.cookie);
handshakeData.sessionID = connect.utils.parseSignedCookie(handshakeData.cookie['express.sid'], config.secret);
handshakeData.sessionID = connect.utils.parseSignedCookie(handshakeData.cookie['express.sid'], global.config.secret);
if (handshakeData.cookie['express.sid'] == handshakeData.sessionID) {
return accept('Cookie is invalid.', false);
@@ -302,18 +301,9 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
});
socket.on('api:config.setup', function(data) {
async.parallel([
function(next) {
meta.config.set('redis/host', data['redis/host'], next);
},
function(next) {
meta.config.set('redis/port', data['redis/port'], next);
}
], function(err) {
meta.config.get(function(config) {
socket.emit('api:config.setup', config);
});
socket.on('api:config.get', function(data) {
meta.config.get(function(config) {
socket.emit('api:config.get', config);
});
});