diff options
-rw-r--r-- | shared/extra-utils/miscs/miscs.ts | 6 | ||||
-rw-r--r-- | support/nginx/peertube | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shared/extra-utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts index 08f41a7e7..ae8a26c98 100644 --- a/shared/extra-utils/miscs/miscs.ts +++ b/shared/extra-utils/miscs/miscs.ts | |||
@@ -64,7 +64,11 @@ function buildAbsoluteFixturePath (path: string, customCIPath = false) { | |||
64 | return path | 64 | return path |
65 | } | 65 | } |
66 | 66 | ||
67 | if (customCIPath && process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path) | 67 | if (customCIPath) { |
68 | if (process.env.GITLAB_CI) return join(root(), 'cached-fixtures', path) | ||
69 | |||
70 | if (process.env.TRAVIS) return join(process.env.HOME, 'fixtures', path) | ||
71 | } | ||
68 | 72 | ||
69 | return join(root(), 'server', 'tests', 'fixtures', path) | 73 | return join(root(), 'server', 'tests', 'fixtures', path) |
70 | } | 74 | } |
diff --git a/support/nginx/peertube b/support/nginx/peertube index fee0f5d1c..aca985785 100644 --- a/support/nginx/peertube +++ b/support/nginx/peertube | |||
@@ -59,7 +59,7 @@ server { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | # Bypass PeerTube for performance reasons. Could be removed | 61 | # Bypass PeerTube for performance reasons. Could be removed |
62 | location ~ ^/client/(.*\.(js|css|woff2|otf|ttf|woff|eot))$ { | 62 | location ~ ^/client/(.*\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$ { |
63 | add_header Cache-Control "public, max-age=31536000, immutable"; | 63 | add_header Cache-Control "public, max-age=31536000, immutable"; |
64 | 64 | ||
65 | alias /var/www/peertube/peertube-latest/client/dist/$1; | 65 | alias /var/www/peertube/peertube-latest/client/dist/$1; |