Improve nginx client images cache

Chocobozzz · Jul 29, 2019 · c928e13 · c928e13
1 parent 1f82e3e
commit c928e13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
@@ -64,7 +64,11 @@ function buildAbsoluteFixturePath (path: string, customCIPath = false) {
  return path
  }
 
- if (customCIPath && process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path)
+ if (customCIPath) {
+ if (process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path)
+
+ if (process.env.TRAVIS) return join(process.env.HOME, 'fixtures', path)
+ }
 
  return join(root(), 'server', 'tests', 'fixtures', path)
 }

diff --git a/support/nginx/peertube b/support/nginx/peertube
@@ -59,7 +59,7 @@ server {
  }
 
  # Bypass PeerTube for performance reasons. Could be removed
- location ~ ^/client/(.*\.(js|css|woff2|otf|ttf|woff|eot))$ {
+ location ~ ^/client/(.*\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$ {
  add_header Cache-Control "public, max-age=31536000, immutable";
 
  alias /var/www/peertube/peertube-latest/client/dist/$1;