diff --git a/app.js b/app.js index 4785119cc2..13d325ba19 100644 --- a/app.js +++ b/app.js @@ -21,8 +21,8 @@ var fs = require('fs'), path = require('path'), utils = require('./public/src/utils.js'), url = require('url'), - ver = '0.0.2', args = {}; +global.ver = '0.0.2'; // Runtime environment global.env = process.env.NODE_ENV || 'production', @@ -36,7 +36,7 @@ process.argv.slice(2).forEach(function(value) { }); // Log GNU copyright info along with server info -console.log('Info: NodeBB v' + ver + ' Copyright (C) 2013 DesignCreatePlay Inc.'); +console.log('Info: NodeBB v' + global.ver + ' Copyright (C) 2013 DesignCreatePlay Inc.'); console.log('Info: This program comes with ABSOLUTELY NO WARRANTY.'); console.log('Info: This is free software, and you are welcome to redistribute it under certain conditions.'); console.log('Info: ==='); @@ -46,8 +46,8 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) { global.config = JSON.parse(data); global.config.url = global.config.base_url + (global.config.use_port ? ':' + global.config.port : '') + '/'; global.config.upload_url = global.config.url + 'uploads/'; - - console.log('Info: Initializing NodeBB v' + ver + ', on port ' + global.config.port + ', using Redis store at ' + global.config.redis.host + ':' + global.config.redis.port + '.'); + + console.log('Info: Initializing NodeBB v' + global.ver + ', on port ' + global.config.port + ', using Redis store at ' + global.config.redis.host + ':' + global.config.redis.port + '.'); console.log('Info: Base Configuration OK.'); var meta = require('./src/meta.js'); diff --git a/src/webserver.js b/src/webserver.js index 6f9ab3decf..fca2800e1f 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -304,7 +304,7 @@ var express = require('express'), async.each(data.categories, iterator, function(err) { data.motd_class = (config.show_motd === '1' || config.show_motd === undefined) ? '' : 'none'; - data.motd = marked(config.motd || "# NodeBB v0.1\nWelcome to NodeBB, the discussion platform of the future.\n\n Get NodeBB Fork us on Github @dcplabs"); + data.motd = marked(config.motd || "# NodeBB v" + global.ver + "\nWelcome to NodeBB, the discussion platform of the future.\n\n Get NodeBB Fork us on Github @dcplabs"); res.json(data); });