diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf index 9725167f8..ec9051d09 100644 --- a/docker/devenv/files/nginx.conf +++ b/docker/devenv/files/nginx.conf @@ -92,16 +92,6 @@ http { error_page 301 302 307 = @handle_redirect; } - location ~ ^/github/penpot-files/(?[a-zA-Z0-9\-\_\.]+) { - proxy_pass https://raw.githubusercontent.com/penpot/penpot-files/main/$template_file; - proxy_hide_header Access-Control-Allow-Origin; - proxy_set_header User-Agent "curl/7.74.0"; - proxy_set_header Host "raw.githubusercontent.com"; - proxy_set_header Accept "*/*"; - add_header Access-Control-Allow-Origin $http_origin; - proxy_buffering off; - } - location /internal/gfonts/css { proxy_pass https://fonts.googleapis.com/css?$args; proxy_hide_header Access-Control-Allow-Origin; @@ -124,31 +114,6 @@ http { add_header X-Cache-Status $upstream_cache_status; } - location ~ ^/internal/gfonts/font/(?.+) { - proxy_pass https://fonts.gstatic.com/s/$font_file; - - proxy_hide_header Access-Control-Allow-Origin; - proxy_hide_header Cross-Origin-Resource-Policy; - proxy_hide_header Link; - proxy_hide_header Alt-Svc; - proxy_hide_header Cache-Control; - proxy_hide_header Expires; - proxy_hide_header Cross-Origin-Opener-Policy; - proxy_hide_header Report-To; - - proxy_ignore_headers Set-Cookie Vary Cache-Control Expires; - - proxy_set_header User-Agent "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"; - proxy_set_header Host "fonts.gstatic.com"; - proxy_set_header Accept "*/*"; - - proxy_cache penpot; - - add_header Access-Control-Allow-Origin $http_origin; - add_header Cache-Control max-age=86400; - add_header X-Cache-Status $upstream_cache_status; - } - location /internal/assets { internal; alias /home/penpot/penpot/backend/assets; @@ -192,6 +157,41 @@ http { } location / { + location ~ ^/github/penpot-files/(?[a-zA-Z0-9\-\_\.]+) { + proxy_pass https://raw.githubusercontent.com/penpot/penpot-files/main/$template_file; + proxy_hide_header Access-Control-Allow-Origin; + proxy_set_header User-Agent "curl/7.74.0"; + proxy_set_header Host "raw.githubusercontent.com"; + proxy_set_header Accept "*/*"; + add_header Access-Control-Allow-Origin $http_origin; + proxy_buffering off; + } + + location ~ ^/internal/gfonts/font/(?.+) { + proxy_pass https://fonts.gstatic.com/s/$font_file; + + proxy_hide_header Access-Control-Allow-Origin; + proxy_hide_header Cross-Origin-Resource-Policy; + proxy_hide_header Link; + proxy_hide_header Alt-Svc; + proxy_hide_header Cache-Control; + proxy_hide_header Expires; + proxy_hide_header Cross-Origin-Opener-Policy; + proxy_hide_header Report-To; + + proxy_ignore_headers Set-Cookie Vary Cache-Control Expires; + + proxy_set_header User-Agent "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"; + proxy_set_header Host "fonts.gstatic.com"; + proxy_set_header Accept "*/*"; + + proxy_cache penpot; + + add_header Access-Control-Allow-Origin $http_origin; + add_header Cache-Control max-age=86400; + add_header X-Cache-Status $upstream_cache_status; + } + location ~ ^/(/|css|fonts|images|js|wasm) { } diff --git a/docker/images/files/nginx.conf b/docker/images/files/nginx.conf index 30691f8b0..b7cccedc2 100644 --- a/docker/images/files/nginx.conf +++ b/docker/images/files/nginx.conf @@ -115,31 +115,6 @@ http { add_header X-Cache-Status $upstream_cache_status; } - location ~ ^/internal/gfonts/font/(?.+) { - proxy_pass https://fonts.gstatic.com/s/$font_file; - - proxy_hide_header Access-Control-Allow-Origin; - proxy_hide_header Cross-Origin-Resource-Policy; - proxy_hide_header Link; - proxy_hide_header Alt-Svc; - proxy_hide_header Cache-Control; - proxy_hide_header Expires; - proxy_hide_header Cross-Origin-Opener-Policy; - proxy_hide_header Report-To; - - proxy_ignore_headers Set-Cookie Vary Cache-Control Expires; - - proxy_set_header User-Agent "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"; - proxy_set_header Host "fonts.gstatic.com"; - proxy_set_header Accept "*/*"; - - proxy_cache penpot; - - add_header Access-Control-Allow-Origin $http_origin; - add_header Cache-Control max-age=86400; - add_header X-Cache-Status $upstream_cache_status; - } - location /internal/assets { internal; alias /opt/data/assets; @@ -161,6 +136,31 @@ http { } location / { + location ~ ^/internal/gfonts/font/(?.+) { + proxy_pass https://fonts.gstatic.com/s/$font_file; + + proxy_hide_header Access-Control-Allow-Origin; + proxy_hide_header Cross-Origin-Resource-Policy; + proxy_hide_header Link; + proxy_hide_header Alt-Svc; + proxy_hide_header Cache-Control; + proxy_hide_header Expires; + proxy_hide_header Cross-Origin-Opener-Policy; + proxy_hide_header Report-To; + + proxy_ignore_headers Set-Cookie Vary Cache-Control Expires; + + proxy_set_header User-Agent "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"; + proxy_set_header Host "fonts.gstatic.com"; + proxy_set_header Accept "*/*"; + + proxy_cache penpot; + + add_header Access-Control-Allow-Origin $http_origin; + add_header Cache-Control max-age=86400; + add_header X-Cache-Status $upstream_cache_status; + } + location ~* \.(js|css).*$ { add_header Cache-Control "max-age=86400" always; # 24 hours }