Merge branch 'master' into use-handshake-docker-image

docker-compose.accounts.yml

@@ -20,11 +20,7 @@ services:
       - ACCOUNTS_LIMIT_ACCESS=${ACCOUNTS_LIMIT_ACCESS:-authenticated} # default to authenticated access only
 
   accounts:
-    build:
+    image: skynetlabs/skynet-accounts
-      context: ./docker/accounts
-      dockerfile: Dockerfile
-      args:
-        branch: main
     container_name: accounts
     restart: unless-stopped
     logging: *default-logging

docker/accounts/Dockerfile

@@ -1,22 +0,0 @@
-FROM golang:1.16.7
-LABEL maintainer="SkynetLabs <devs@siasky.net>"
-
-ENV GOOS linux
-ENV GOARCH amd64
-
-ARG branch=main
-
-WORKDIR /root
-
-RUN git clone --single-branch --branch ${branch} https://github.com/SkynetLabs/skynet-accounts.git && \
-    cd skynet-accounts && \
-    go mod download && \
-    make release
-
-ENV SKYNET_DB_HOST="localhost"
-ENV SKYNET_DB_PORT="27017"
-ENV SKYNET_DB_USER="username"
-ENV SKYNET_DB_PASS="password"
-ENV SKYNET_ACCOUNTS_PORT=3000
-
-ENTRYPOINT ["skynet-accounts"]

docker/nginx/conf.d/include/location-skylink

@@ -25,6 +25,8 @@ set $skynet_proof '';
 set $limit_rate 0;
 
 access_by_lua_block {
+    -- the block below only makes sense if we are using nginx cache
+    if not ngx.var.skyd_disk_cache_enabled then
         local httpc = require("resty.http").new()
 
         -- detect whether requested skylink is v2
@@ -61,6 +63,7 @@ access_by_lua_block {
         if ngx.shared.nocache:get(ngx.var.skylink_v1) then
             ngx.var.nocache = "1"
         end
+    end
 
     if require("skynet.account").accounts_enabled() then
         -- check if portal is in authenticated only mode
@@ -85,6 +88,8 @@ header_filter_by_lua_block {
     ngx.header["Skynet-Portal-Api"] = ngx.var.scheme .. "://" .. os.getenv("PORTAL_DOMAIN")
     ngx.header["Skynet-Server-Api"] = ngx.var.scheme .. "://" .. os.getenv("SERVER_DOMAIN")
 
+    -- the block below only makes sense if we are using nginx cache
+    if not ngx.var.skyd_disk_cache_enabled then
         -- not empty skynet_proof means this is a skylink v2 request
         -- so we should replace the Skynet-Proof header with the one
         -- we got from /skynet/resolve/ endpoint, otherwise we would
@@ -98,6 +103,7 @@ header_filter_by_lua_block {
         if ngx.header["Content-Length"] and tonumber(ngx.header["Content-Length"]) > 1e+9 then
             ngx.shared.nocache:set(ngx.var.skylink_v1, ngx.header["Content-Length"])
         end
+    end
 }
 
 limit_rate_after 512k;

docker/nginx/conf.d/server.dnslink.conf

@@ -2,14 +2,12 @@ lua_shared_dict dnslink 10m;
 
 server {
     listen 80 default_server;
-    listen [::]:80 default_server;
     
     include /etc/nginx/conf.d/server/server.dnslink;
 }
 
 server {
     listen 443 default_server;
-    listen [::]:443 default_server;
 
     ssl_certificate     /etc/ssl/local-certificate.crt;
     ssl_certificate_key /etc/ssl/local-certificate.key;

docker/nginx/conf.d/server.local.conf

@@ -1,7 +1,6 @@
 server {
     # local server - do not expose this port externally
     listen 8000;
-    listen [::]:8000;
 
     # secure traffic by limiting to only local networks
     include /etc/nginx/conf.d/include/local-network-only;

docker/nginx/conf.d/server/server.account

@@ -1,5 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
 
 include /etc/nginx/conf.d/include/ssl-settings;
 include /etc/nginx/conf.d/include/init-optional-variables;

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

@@ -1,5 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
 
 include /etc/nginx/conf.d/include/ssl-settings;
 include /etc/nginx/conf.d/include/init-optional-variables;

docker/nginx/conf.d/server/server.hns

@@ -1,5 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
 
 include /etc/nginx/conf.d/include/ssl-settings;
 include /etc/nginx/conf.d/include/init-optional-variables;

docker/nginx/conf.d/server/server.http

@@ -1,5 +1,4 @@
 listen 80;
-listen [::]:80;
 
 include /etc/nginx/conf.d/include/init-optional-variables;
 

docker/nginx/conf.d/server/server.skylink

@@ -1,5 +1,4 @@
 listen 443 ssl http2;
-listen [::]:443 ssl http2;
 
 include /etc/nginx/conf.d/include/ssl-settings;
 include /etc/nginx/conf.d/include/init-optional-variables;