Merge branch 'master' into portal-latest

CHANGELOG.md

@@ -10,15 +10,21 @@ Version History
 
 Latest:
 
-## Sep 21, 2021:
+## Oct 18, 2021:
-### deploy-2021-09-21
+### v0.1.3
 **Key Updates**
 - Change skyd 307 redirect code to 308
 - Set caddy dns entry ttl limit to 15 minutes to remove stranded entries.
+- Set skyd up to connect to the local mongodb cluster for storing TUS metadata
 - Update health check disable command to require reason.
+- Move MongoDB to a separate service (use `PORTAL_MODULES=m` to use it without accounts)
 - Add proper handling for options response on /skynet/tus endpoint
+- added unpinning skylinks from account dashboard
 
 **Bugs Fixed**
+- include tus header upload-concat in cors requests
+- fixed issue with caddy requesting new certificates instead of using existing ones from file storage
+- fixed the latest news link redirect in the news header
 - Fix extended checks error by rounding the reported datetime.
 
 **Other**

changelog/changelog-tail.md

@@ -1,3 +1,23 @@
+## Oct 18, 2021:
+### v0.1.3
+**Key Updates**
+- Change skyd 307 redirect code to 308
+- Set caddy dns entry ttl limit to 15 minutes to remove stranded entries.
+- Set skyd up to connect to the local mongodb cluster for storing TUS metadata
+- Update health check disable command to require reason.
+- Move MongoDB to a separate service (use `PORTAL_MODULES=m` to use it without accounts)
+- Add proper handling for options response on /skynet/tus endpoint
+- added unpinning skylinks from account dashboard
+
+**Bugs Fixed**
+- include tus header upload-concat in cors requests
+- fixed issue with caddy requesting new certificates instead of using existing ones from file storage
+- fixed the latest news link redirect in the news header
+- Fix extended checks error by rounding the reported datetime.
+
+**Other**
+- Remove outdated references to NebulousLabs
+
 
 
 ## August 9th, 2021:

changelog/items/bugs-fixed/expose-upload-concat.md

@@ -1 +0,0 @@
-- include tus header upload-concat in cors requests

changelog/items/bugs-fixed/fix-caddy.md

@@ -1 +0,0 @@
-- fixed issue with caddy requesting new certificates instead of using existing ones from file storage

changelog/items/bugs-fixed/fix-external-links-on-news-header.md

@@ -1 +0,0 @@
-- fixed the latest news link redirect in the news header

changelog/items/bugs-fixed/round-reporting-datetime.md

@@ -1 +0,0 @@
-- Fix extended checks error by rounding the reported datetime.

changelog/items/key-updates/308-redirect-code.md

@@ -1 +0,0 @@
-- Change skyd 307 redirect code to 308

changelog/items/key-updates/caddy-dns-ttl-limit.md

@@ -1 +0,0 @@
-- Set caddy dns entry ttl limit to 15 minutes to remove stranded entries.

changelog/items/key-updates/enable-mongodb-for-skyd.md

@@ -1 +0,0 @@
-- Set skyd up to connect to the local mongodb cluster for storing TUS metadata

changelog/items/key-updates/health-check-disable-reason.md

@@ -1 +0,0 @@
-- Update health check disable command to require reason.

changelog/items/key-updates/mongo-service.md

@@ -1 +0,0 @@
-- Move MongoDB to a separate service (use `PORTAL_MODULES=m` to use it without accounts)

changelog/items/key-updates/tus-options-response.md

@@ -1 +0,0 @@
-- Add proper handling for options response on /skynet/tus endpoint

changelog/items/key-updates/unpin-skylink.md

@@ -1 +0,0 @@
-- added unpinning skylinks from account dashboard

changelog/items/other/remove-nebulous-labs.md

@@ -1 +0,0 @@
-- Remove outdated references to NebulousLabs

docker/nginx/conf.d/include/track-registry

@@ -7,7 +7,7 @@ log_by_lua_block {
         if premature then return end
 
         local httpc = require("resty.http").new()
-        local method = request_method == ngx.HTTP_GET and "read" or "write"
+        local method = request_method == "GET" and "read" or "write"
 
         -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
         local res, err = httpc:request_uri("http://10.10.10.70:3000/track/registry/" .. method, {

docker/nginx/conf.d/server/server.api

@@ -26,6 +26,16 @@ rewrite ^/skynet/blacklist /skynet/blocklist permanent;
 location / {
     include /etc/nginx/conf.d/include/cors;
 
+    set $skylink "0404dsjvti046fsua4ktor9grrpe76erq9jot9cvopbhsvsu76r4r30";
+    set $path $uri;
+
+    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;
 }
 

packages/health-check/src/checks/critical.js

@@ -58,6 +58,13 @@ 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 = "0404dsjvti046fsua4ktor9grrpe76erq9jot9cvopbhsvsu76r4r30";
+
+  return done(await genericAccessCheck("website_skylink", websiteSkylink));
+}
+
 // accountWebsiteCheck returns the result of accessing account dashboard website
 async function accountWebsiteCheck(done) {
   const url = `${process.env.SKYNET_DASHBOARD_URL}/auth/login`;
@@ -159,6 +166,7 @@ async function genericAccessCheck(name, url) {
 const checks = [
   uploadCheck,
   websiteCheck,
+  websiteSkylinkCheck,
   downloadCheck,
   skylinkSubdomainCheck,
   handshakeSubdomainCheck,