From 3b47411f3193b159aea629193a3eb9b145228ba0 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 3 Mar 2022 16:27:19 +0100 Subject: [PATCH 1/3] redirect sdk docs to sdk.skynetlabs.com --- docker/nginx/conf.d/server/server.api | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/nginx/conf.d/server/server.api b/docker/nginx/conf.d/server/server.api index 11a3ee75..da452d1d 100644 --- a/docker/nginx/conf.d/server/server.api +++ b/docker/nginx/conf.d/server/server.api @@ -21,6 +21,7 @@ client_max_body_size 128k; rewrite ^/portals /skynet/portals permanent; rewrite ^/stats /skynet/stats permanent; rewrite ^/skynet/blacklist /skynet/blocklist permanent; +rewrite ^/docs https://sdk.skynetlabs.com permanent; location / { include /etc/nginx/conf.d/include/cors; @@ -39,10 +40,6 @@ location @fallback { proxy_pass http://website:9000; } -location /docs { - proxy_pass https://skynetlabs.github.io/skynet-docs; -} - location /skynet/blocklist { include /etc/nginx/conf.d/include/cors; From 7a213bb05aabfce65ab8e8db8f9e267f5fa1c309 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 3 Mar 2022 16:44:27 +0100 Subject: [PATCH 2/3] match also static pages like /docs/v4 --- docker/nginx/conf.d/server/server.api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx/conf.d/server/server.api b/docker/nginx/conf.d/server/server.api index da452d1d..82c7c62c 100644 --- a/docker/nginx/conf.d/server/server.api +++ b/docker/nginx/conf.d/server/server.api @@ -21,7 +21,7 @@ client_max_body_size 128k; rewrite ^/portals /skynet/portals permanent; rewrite ^/stats /skynet/stats permanent; rewrite ^/skynet/blacklist /skynet/blocklist permanent; -rewrite ^/docs https://sdk.skynetlabs.com permanent; +rewrite ^/docs(?:/(.*))?$ https://sdk.skynetlabs.com/$1 permanent; location / { include /etc/nginx/conf.d/include/cors; From 55f57c9fa27afbea7cb715c1ee4a6288298fdf82 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Sun, 6 Mar 2022 14:33:23 +0100 Subject: [PATCH 3/3] Revert "use skynet to load our homepage" This reverts commit ffb1e499b9c996dd1075c2b4778384f39f49101e. --- docker/nginx/conf.d/server/server.api | 11 ----------- packages/health-check/src/checks/critical.js | 9 --------- 2 files changed, 20 deletions(-) diff --git a/docker/nginx/conf.d/server/server.api b/docker/nginx/conf.d/server/server.api index 8ea1d468..a0db9296 100644 --- a/docker/nginx/conf.d/server/server.api +++ b/docker/nginx/conf.d/server/server.api @@ -26,17 +26,6 @@ rewrite ^/docs(?:/(.*))?$ https://sdk.skynetlabs.com/$1 permanent; location / { include /etc/nginx/conf.d/include/cors; - set $skylink "0404dsjvti046fsua4ktor9grrpe76erq9jot9cvopbhsvsu76r4r30"; - set $path $uri; - set $internal_no_limits "true"; - - include /etc/nginx/conf.d/include/location-skylink; - - proxy_intercept_errors on; - error_page 400 404 490 500 502 503 504 =200 @fallback; -} - -location @fallback { proxy_pass http://website:9000; } diff --git a/packages/health-check/src/checks/critical.js b/packages/health-check/src/checks/critical.js index 546d9f88..127ebd8a 100644 --- a/packages/health-check/src/checks/critical.js +++ b/packages/health-check/src/checks/critical.js @@ -89,14 +89,6 @@ async function handshakeSubdomainCheck(done) { return done(await genericAccessCheck("hns_via_subdomain", url)); } -// websiteSkylinkCheck returns the result of accessing siasky.net website through skylink -async function websiteSkylinkCheck(done) { - const websiteSkylink = "AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA"; - const url = await skynetClient.getSkylinkUrl(websiteSkylink, { subdomain: true }); - - return done(await genericAccessCheck("website_skylink", url)); -} - // accountWebsiteCheck returns the result of accessing account dashboard website async function accountWebsiteCheck(done) { const url = `https://account.${process.env.PORTAL_DOMAIN}/auth/login`; @@ -228,7 +220,6 @@ const checks = [ skydConfigCheck, uploadCheck, websiteCheck, - websiteSkylinkCheck, downloadCheck, skylinkSubdomainCheck, handshakeSubdomainCheck,