Mailer Information
+ + + ++
+
+
+
+
\ No newline at end of file
diff --git a/public/templates/install/privileges.tpl b/public/templates/install/privileges.tpl
new file mode 100644
index 0000000000..5a3659e5e1
--- /dev/null
+++ b/public/templates/install/privileges.tpl
@@ -0,0 +1,46 @@
+
+User Privilege Thresholds
+ + + ++
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/templates/install/redis.tpl b/public/templates/install/redis.tpl
new file mode 100644
index 0000000000..e60954ee89
--- /dev/null
+++ b/public/templates/install/redis.tpl
@@ -0,0 +1,81 @@
+
+Step 1 – Establish Redis Connection
+ ++ Thanks for choosing to install NodeBB! We'll need some information to set up your installation + configuration... +
++ Please enter the details of your Redis server here. If redis is hosted on the same + server as NodeBB, you can leave the default values as-is. +
+ + + ++
+
+
+
+
diff --git a/public/templates/install/social.tpl b/public/templates/install/social.tpl
new file mode 100644
index 0000000000..16654f8f93
--- /dev/null
+++ b/public/templates/install/social.tpl
@@ -0,0 +1,47 @@
+
+Social Media Logins
+ + + ++
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/meta.js b/src/meta.js
new file mode 100644
index 0000000000..44d31f2abc
--- /dev/null
+++ b/src/meta.js
@@ -0,0 +1,58 @@
+var utils = require('./../public/src/utils.js'),
+ RDB = require('./redis.js'),
+ async = require('async');
+
+(function(Meta) {
+ Meta.testRedis = function(callback) {
+ RDB.set('nodebb-redis-test', 'foobar', function(err, res) {
+ if (!err) {
+ RDB.get('nodebb-redis-test', function(err, res) {
+ if (!err && res === 'foobar') {
+ callback(true);
+ } else {
+ callback(false);
+ }
+ });
+ } else {
+ callback(false);
+ }
+ });
+ }
+
+ Meta.config = {
+ get: function(callback) {
+ var config = {};
+
+ async.waterfall([
+ function(next) {
+ RDB.hkeys('config', function(err, keys) {
+ next(err, keys);
+ });
+ },
+ function(keys, next) {
+ async.each(keys, function(key, next) {
+ RDB.hget('config', key, function(err, value) {
+ if (!err) {
+ config[key] = value;
+ }
+
+ next(err);
+ });
+ }, next);
+ }
+ ], function(err) {
+ if (!err) {
+ config.status = 'ok';
+ callback(config);
+ } else callback({
+ status: 'error'
+ });
+ });
+ },
+ set: function(field, value, callback) {
+ RDB.hset('config', field, value, function(err, res) {
+ callback(err);
+ });
+ }
+ }
+}(exports));
\ No newline at end of file
diff --git a/src/notifications.js b/src/notifications.js
index 8ea7dc9f24..3e63628068 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -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');
diff --git a/src/postTools.js b/src/postTools.js
index 682ae1d51d..74cce37873 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -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) {
diff --git a/src/posts.js b/src/posts.js
index 7cc19c5c8c..58c6b38618 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -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'),
feed = require('./feed.js'),
async = require('async');
diff --git a/src/redis.js b/src/redis.js
index 935e8afe06..5ac950f057 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -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) {
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index e9c17d29ea..3777e2f478 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -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) {
diff --git a/src/routes/install.js b/src/routes/install.js
new file mode 100644
index 0000000000..5b352fcd71
--- /dev/null
+++ b/src/routes/install.js
@@ -0,0 +1,44 @@
+
+var RDB = require('../redis.js');
+
+(function(Install) {
+ Install.create_routes = function(app) {
+
+ (function() {
+ var routes = ['basic', 'redis', 'mail', 'social', 'privileges'];
+
+ for (var i=0, ii=routes.length; i