Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / server / controllers / static.ts

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index baafe1ac45b45d256bfc8c0e4adcf5135d51401c..4fd58f70c008b11704042f558fce4d42eaf3354a 100644 (file)
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -34,12 +34,17 @@ staticRouter.use(
 )
 
 // Videos path for webseeding
-const videosPhysicalPath = CONFIG.STORAGE.VIDEOS_DIR
 staticRouter.use(
   STATIC_PATHS.WEBSEED,
   cors(),
-  express.static(videosPhysicalPath)
+  express.static(CONFIG.STORAGE.VIDEOS_DIR, { fallthrough: false }) // 404 because we don't have this video
 )
+staticRouter.use(
+  STATIC_PATHS.REDUNDANCY,
+  cors(),
+  express.static(CONFIG.STORAGE.REDUNDANCY_DIR, { fallthrough: false }) // 404 because we don't have this video
+)
+
 staticRouter.use(
   STATIC_DOWNLOAD_PATHS.VIDEOS + ':id-:resolution([0-9]+).:extension',
   asyncMiddleware(videosGetValidator),
@@ -120,7 +125,7 @@ staticRouter.use('/.well-known/dnt-policy.txt',
   (_, res: express.Response) => {
     res.type('text/plain')
 
-    return res.sendFile(join(root(), 'server/static/dnt-policy/dnt-policy-1.0.txt'))
+    return res.sendFile(join(root(), 'dist/server/static/dnt-policy/dnt-policy-1.0.txt'))
   }
 )
 
@@ -131,6 +136,12 @@ staticRouter.use('/.well-known/dnt/',
   }
 )
 
+staticRouter.use('/.well-known/change-password',
+  (_, res: express.Response) => {
+    res.redirect('/my-account/settings')
+  }
+)
+
 // ---------------------------------------------------------------------------
 
 export {