From 5d36dfc6eed63a9b0c7e19a318acf0a39ad5cead Mon Sep 17 00:00:00 2001 From: Redume Date: Sat, 1 Mar 2025 22:01:25 +0300 Subject: [PATCH 1/5] chore: add mime types for nginx --- nginx/mime.types | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 nginx/mime.types diff --git a/nginx/mime.types b/nginx/mime.types new file mode 100644 index 0000000..1c00d70 --- /dev/null +++ b/nginx/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} From 84e5d389a0a466788ef488aefa40e3def1e265df Mon Sep 17 00:00:00 2001 From: Redume Date: Sat, 1 Mar 2025 22:01:39 +0300 Subject: [PATCH 2/5] chore: delete restarts for docs --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 17175e0..fa60175 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -56,7 +56,6 @@ services: build: context: ./docs dockerfile: Dockerfile - restart: unless-stopped collect-currency: build: From ae9402e0da961af692f4fc5624235e1a8feba4f1 Mon Sep 17 00:00:00 2001 From: Redume Date: Sat, 1 Mar 2025 22:01:59 +0300 Subject: [PATCH 3/5] fix(nginx): delete global ratelimit --- nginx/nginx.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 953ad70..a545955 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,14 +1,14 @@ events { } http { + include /etc/nginx/mime.types; + limit_req_zone $binary_remote_addr zone=kekkai:10m rate=10r/s; server { listen 80; server_name localhost; # Your domain - limit_req zone=kekkai; - return 301 https://$host$request_uri$is_args$args; } @@ -19,9 +19,7 @@ http { ssl_certificate /etc/nginx/ssl/fullchain.pem; ssl_certificate_key /etc/nginx/ssl/privkey.pem; - - limit_req zone=kekkai; - + include chart/nginx.conf; include server/nginx.conf; include web/nginx.conf; From 520df5465028abd3dd560e9018cfef6696f8ac4e Mon Sep 17 00:00:00 2001 From: Redume Date: Sat, 1 Mar 2025 22:02:17 +0300 Subject: [PATCH 4/5] fix(nginx): delete ratelimit for /static/chart --- nginx/chart/nginx.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/nginx/chart/nginx.conf b/nginx/chart/nginx.conf index 6521b68..9d90ddd 100644 --- a/nginx/chart/nginx.conf +++ b/nginx/chart/nginx.conf @@ -9,8 +9,6 @@ location /api/getChart { } location /static/chart { - limit_req zone=kekkai burst=4; - proxy_pass http://chart:3030; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From b1c234cb5e5653bb47bb4d57911a8b61804e643a Mon Sep 17 00:00:00 2001 From: Redume Date: Sat, 1 Mar 2025 22:03:07 +0300 Subject: [PATCH 5/5] chore(nginx): Disabled static handling for _astro, assets, docs, and pagefind in Nginx --- nginx/docs/nginx.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nginx/docs/nginx.conf b/nginx/docs/nginx.conf index f08d409..543c6df 100644 --- a/nginx/docs/nginx.conf +++ b/nginx/docs/nginx.conf @@ -1,3 +1,4 @@ -root dist; - -try_files $uri $uri/ /index.html; \ No newline at end of file +location ~ ^/(_astro|assets|docs|pagefind)/ { + root /etc/nginx/dist; + index index.html; +}