Fix dnt route

diff --git a/scripts/build/server.sh b/scripts/build/server.sh
index 41b59a212c59e22bfd54cf98ce91143ad6b6d1d4..bd4d1bf47f53d99d0a8cc079209d194ba9e446f2 100755 (executable)
--- 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 63f78b3b3e11799bdbebe1a57467ac1975aa3081..baafe1ac45b45d256bfc8c0e4adcf5135d51401c 100644 (file)
--- 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'))
   }
 )