LumeWeb
/
skynet-webportal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into reenable-end-to-end-upload-test

This commit is contained in:
Karol Wypchło 2022-03-07 12:56:25 +01:00 committed by GitHub
parent 77f0dcc3ca 1aac9807c2
commit 34f76c607d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/nginx/conf.d/server/server.api
View File

@ -21,28 +21,14 @@ client_max_body_size 128k;
rewrite ^/portals /skynet/portals permanent; rewrite ^/portals /skynet/portals permanent;
rewrite ^/stats /skynet/stats permanent; rewrite ^/stats /skynet/stats permanent;
rewrite ^/skynet/blacklist /skynet/blocklist permanent; rewrite ^/skynet/blacklist /skynet/blocklist permanent;
rewrite ^/docs(?:/(.*))?$ https://sdk.skynetlabs.com/$1 permanent;
location / { location / {
include /etc/nginx/conf.d/include/cors; 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; proxy_pass http://website:9000;
} }
location /docs {
proxy_pass https://skynetlabs.github.io/skynet-docs;
}
location /skynet/blocklist { location /skynet/blocklist {
include /etc/nginx/conf.d/include/cors; include /etc/nginx/conf.d/include/cors;

9
packages/health-check/src/checks/critical.js
View File

@ -89,14 +89,6 @@ async function handshakeSubdomainCheck(done) {
return done(await genericAccessCheck("hns_via_subdomain", url)); 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 // accountWebsiteCheck returns the result of accessing account dashboard website
async function accountWebsiteCheck(done) { async function accountWebsiteCheck(done) {
const url = `https://account.${process.env.PORTAL_DOMAIN}/auth/login`; const url = `https://account.${process.env.PORTAL_DOMAIN}/auth/login`;
@ -228,7 +220,6 @@ const checks = [
skydConfigCheck, skydConfigCheck,
uploadCheck, uploadCheck,
websiteCheck, websiteCheck,
websiteSkylinkCheck,
downloadCheck, downloadCheck,
skylinkSubdomainCheck, skylinkSubdomainCheck,
handshakeSubdomainCheck, handshakeSubdomainCheck,