diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js index 3275bd3ff..bf8494196 100644 --- a/src/node/hooks/express.js +++ b/src/node/hooks/express.js @@ -13,6 +13,8 @@ exports.createServer = function () { console.log("Report bugs at https://github.com/ether/etherpad-lite/issues") serverName = "Etherpad " + settings.getGitCommit() + " (http://etherpad.org)"; + + console.log("Your Etherpad version is " + settings.getEpVersion() + " (" + settings.getGitCommit() + ")"); exports.restartServer(); diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index c49d6621e..1ae8d7b50 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -4,7 +4,6 @@ var installer = require('ep_etherpad-lite/static/js/pluginfw/installer'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); var _ = require('underscore'); var semver = require('semver'); -var epVersion = require('ep_etherpad-lite/package.json').version; exports.expressCreateServer = function (hook_name, args, cb) { args.app.get('/admin/plugins', function(req, res) { @@ -18,6 +17,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); args.app.get('/admin/plugins/info', function(req, res) { var gitCommit = settings.getGitCommit(); + var epVersion = settings.getEpVersion(); res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", { gitCommit: gitCommit, diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 07f5055c0..7e0e6c5a1 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -207,6 +207,11 @@ exports.getGitCommit = function() { return version; } +// Return etherpad version from package.json +exports.getEpVersion = function() { + return require('ep_etherpad-lite/package.json').version; +} + exports.reloadSettings = function reloadSettings() { // Discover where the settings file lives var settingsFilename = argv.settings || "settings.json";