diff options
Diffstat (limited to 'src/node/hooks/express/specialpages.js')
| -rw-r--r-- | src/node/hooks/express/specialpages.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js index 474f475e..50d27700 100644 --- a/src/node/hooks/express/specialpages.js +++ b/src/node/hooks/express/specialpages.js @@ -12,8 +12,16 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve robots.txt args.app.get('/robots.txt', function(req, res) { - var filePath = path.normalize(__dirname + "/../../../static/robots.txt"); - res.sendfile(filePath); + var filePath = path.normalize(__dirname + "/../../../static/custom/robots.txt"); + res.sendfile(filePath, function(err) + { + //there is no custom favicon, send the default robots.txt which dissallows all + if(err) + { + filePath = path.normalize(__dirname + "/../../../static/robots.txt"); + res.sendfile(filePath); + } + }); }); //serve favicon.ico @@ -34,13 +42,13 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve pad.html under /p args.app.get('/p/:pad', function(req, res, next) { - res.send(eejs.require("ep_etherpad-lite/templates/pad.html")); + res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {req: req})); }); //serve timeslider.html under /p/$padname/timeslider args.app.get('/p/:pad/timeslider', function(req, res, next) { - res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html")); + res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req})); }); }
\ No newline at end of file |