From c370c87496ec27bb2bc31c084badc6ba4349a2c8 Mon Sep 17 00:00:00 2001 From: PJ Date: Tue, 4 Feb 2020 19:26:48 +0100 Subject: [PATCH] Update .gitignore + update nginx config --- .gitignore | 3 ++ setup-scripts/skynet-nginx.conf | 64 ++++++++++++--------------------- 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 5f67ac0d..18d1bae4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.swo *.swp + +node_modules +**/*/.next \ No newline at end of file diff --git a/setup-scripts/skynet-nginx.conf b/setup-scripts/skynet-nginx.conf index 8ecd4f66..a051c86b 100644 --- a/setup-scripts/skynet-nginx.conf +++ b/setup-scripts/skynet-nginx.conf @@ -1,69 +1,49 @@ server { - listen 80; + listen 80; - location / { + location / { client_max_body_size 1000M; + #post_max_size 1000M; proxy_read_timeout 600; - proxy_pass http://127.0.0.1:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } + proxy_pass http://127.0.0.1:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } - location ^~ /api/ { + location ^~ /api/ { client_max_body_size 1000M; + #post_max_size 1000M; proxy_read_timeout 600; rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://127.0.0.1:4000/; - } + proxy_pass http://127.0.0.1:4000/; + } location ~ "^/[a-zA-Z0-9-_+/]{46}$" { client_max_body_size 1000M; + #post_max_size 1000M; proxy_read_timeout 600; proxy_set_header User-Agent: "Sia-Agent"; proxy_set_header Host: localhost; proxy_pass http://127.0.0.1:4000/skylink$request_uri; + + sub_filter 'sia://' 'https://$host/'; + sub_filter_once off; + sub_filter_types text/plain; } - location ~ "^/web/([a-zA-Z0-9-_+/]{46})$" { + location ~ "^/file/([a-zA-Z0-9-_+/]{46})$" { client_max_body_size 1000M; + #post_max_size 1000M; proxy_read_timeout 600; proxy_set_header User-Agent: "Sia-Agent"; proxy_set_header Host: localhost; - proxy_pass http://127.0.0.1:4000/skylink/$1; - - sub_filter 'sia://' 'https://$host/'; - sub_filter_once off; - sub_filter_types text/plain; - } - - location /direct/ { - client_max_body_size 1000M; - #post_max_size 1000M; - proxy_read_timeout 600; - proxy_set_header User-Agent: "Sia-Agent"; - proxy_pass http://127.0.0.1:9980/skynet/skylink/; - } - - location /uploaddirect/ { - client_max_body_size 1000M; - #post_max_size 1000M; - proxy_read_timeout 600; - proxy_set_header User-Agent: "Sia-Agent"; - proxy_pass http://127.0.0.1:9980/renter/linkfile/linkfiles/externaluploads/; - } - - location /stream/ { - client_max_body_size 1000M; - #post_max_size 1000M; - proxy_read_timeout 600; - proxy_set_header User-Agent: "Sia-Agent"; - proxy_pass http://127.0.0.1:9980/renter/stream/; + proxy_pass http://127.0.0.1:4000/skylink/$1?attachment=true; } }