Merge branch 'master' of ssb://%MeCTQrz9uszf9EZoTnKCeFeIedhnKWuB3JHW2l1g9NA=.sha256

This commit is contained in:
Anders Rune Jensen
2018-04-30 15:00:11 +02:00
+8 -3
View File
@@ -93,7 +93,7 @@ exports.init = function (sbot, config) {
case '%': return serveId(req, res, m[1], m[3], m[5]) case '%': return serveId(req, res, m[1], m[3], m[5])
case '@': return serveFeed(req, res, m[1], m[3], m[5]) case '@': return serveFeed(req, res, m[1], m[3], m[5])
case '&': return serveBlob(req, res, sbot, m[1]) case '&': return serveBlob(req, res, sbot, m[1])
default: return servePath(req, res, m[4]) default: return servePath(req, res, m[4], conf)
} }
} }
@@ -453,9 +453,9 @@ function ctype(name) {
} }
} }
function servePath(req, res, url) { function servePath(req, res, url, conf) {
switch (url) { switch (url) {
case '/robots.txt': return res.end('User-agent: *') case '/robots.txt': return serveRobots(req, res, conf)
} }
var m = /^(\/?[^\/]*)(\/.*)?$/.exec(url) var m = /^(\/?[^\/]*)(\/.*)?$/.exec(url)
switch (m[1]) { switch (m[1]) {
@@ -491,6 +491,11 @@ function serveFile(req, res, file) {
}) })
} }
function serveRobots(req, res, conf) {
res.end('User-agent: *'
+ (conf.disallowRobots ? '\nDisallow: /' : ''))
}
function prepend(fn, arg) { function prepend(fn, arg) {
return function (read) { return function (read) {
return function (abort, cb) { return function (abort, cb) {