v1.18.x
Julian Lam 12 years ago
parent 180bec7349
commit 0859793b15

3
.gitignore vendored

@ -6,7 +6,6 @@ npm-debug.log
node_modules/
sftp-config.json
public/config.json
config.js
public/css/style.css
*.sublime-project
*.sublime-workspace
*.sublime-workspace

@ -1,69 +0,0 @@
/**
* READ ME!
* The config directives here are all different based on where NodeBB is installed.
* This config file system will be deprecated soon, and all configs will be moved
* to the redis db, under the hash "config"
*
* As of May 22nd, 2013, this migration hasn't started yet
*/
var config = {
// The "secret" is used to encrypt cookie sessions, change this to any random string
"secret": 'nodebb-secret',
// "base_url" is expected to be a publically accessible URL to your NodeBB instance (Default base_url: 'http://localhost', port: '4567')
"base_url": "http://localhost",
// relative path for uploads
"upload_path": "/public/uploads/",
"use_port": true,
"port": 4567,
// The host and port to the SMTP server used by NodeBB. The "from" value must be changed.
"mailer": {
host: 'localhost',
port: '25',
from: 'mailer@localhost.lan'
},
// Connection details to the redis database instance.
"redis": {
port: "6379",
host: "127.0.0.1",
options: {
}
},
// Social Networking integration. Add the appropriate API keys to activate
// login via alternate method, otherwise the option will not be presented
// to the user
"twitter": {
"key": '',
"secret": ''
},
"google": {
"id": '',
"secret": ''
},
"facebook": {
"app_id": '',
"secret": ''
},
// Privileged Actions Reputation Thresholds
"privilege_thresholds": {
"manage_thread": 1000,
"manage_content": 2000
},
"show_motd": true,
"motd": undefined,
"post_delay" : 10000
}
config.url = config.base_url + (config.use_port ? ':' + config.port : '') + '/';
config.upload_url = config.base_url + (config.use_port ? ':' + config.port : '') + '/uploads/';
module.exports = config;

@ -3,22 +3,6 @@ var utils = require('./../public/src/utils.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 = {};

Loading…
Cancel
Save