From aac0118dc3a563f4923426ec580a8491874922f4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 25 Sep 2018 11:13:34 +0200 Subject: Fix dnt route --- scripts/build/server.sh | 1 + server/controllers/static.ts | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/build/server.sh b/scripts/build/server.sh index 41b59a212..bd4d1bf47 100755 --- a/scripts/build/server.sh +++ b/scripts/build/server.sh @@ -5,3 +5,4 @@ set -eu rm -rf ./dist npm run tsc +cp -r "./server/static" "./dist" diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 63f78b3b3..baafe1ac4 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,5 +1,4 @@ import * as cors from 'cors' -import { createReadStream } from 'fs-extra' import * as express from 'express' import { CONFIG, ROUTE_CACHE_LIFETIME, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers' import { VideosPreviewCache } from '../lib/cache' @@ -10,6 +9,8 @@ import { VideosCaptionCache } from '../lib/cache/videos-caption-cache' import { UserModel } from '../models/account/user' import { VideoCommentModel } from '../models/video/video-comment' import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo' +import { join } from 'path' +import { root } from '../helpers/core-utils' const packageJSON = require('../../../package.json') const staticRouter = express.Router() @@ -118,7 +119,8 @@ staticRouter.use('/.well-known/dnt-policy.txt', asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.DNT_POLICY)), (_, res: express.Response) => { res.type('text/plain') - createReadStream('./server/static/dnt-policy/dnt-policy-1.0.txt').pipe(res) + + return res.sendFile(join(root(), 'server/static/dnt-policy/dnt-policy-1.0.txt')) } ) -- cgit v1.2.3