Merge pull request #1005 from SkynetLabs/fix-os-getenv

os.getenv doesn't take default value in lua
This commit is contained in:
Ivaylo Novakov 2021-07-26 19:57:07 +02:00 committed by GitHub
commit 3bf35d9d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions

View File

@ -9,7 +9,7 @@ x-logging: &default-logging
services: services:
nginx: nginx:
environment: environment:
- ACCOUNTS_ENABLED=1 - ACCOUNTS_ENABLED=true
volumes: volumes:
- ./docker/accounts/nginx.account.conf:/etc/nginx/conf.extra.d/nginx.account.conf:ro - ./docker/accounts/nginx.account.conf:/etc/nginx/conf.extra.d/nginx.account.conf:ro
depends_on: depends_on:
@ -17,7 +17,7 @@ services:
health-check: health-check:
environment: environment:
- ACCOUNTS_ENABLED=1 - ACCOUNTS_ENABLED=true
accounts: accounts:
build: build:

View File

@ -273,7 +273,7 @@ server {
access_by_lua_block { access_by_lua_block {
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true }) local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true })
if res.status == ngx.HTTP_OK then if res.status == ngx.HTTP_OK then
@ -310,7 +310,7 @@ server {
# access_by_lua_block { # access_by_lua_block {
# -- this block runs only when accounts are enabled # -- this block runs only when accounts are enabled
# if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end # if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
# ngx.var.upload_limit_rate = 5 * 1024 * 1024 # ngx.var.upload_limit_rate = 5 * 1024 * 1024
# local res = ngx.location.capture("/accounts/user", { copy_all_vars = true }) # local res = ngx.location.capture("/accounts/user", { copy_all_vars = true })
@ -352,7 +352,7 @@ server {
ngx.req.set_header("SkynetMaxUploadSize", 1073741824) ngx.req.set_header("SkynetMaxUploadSize", 1073741824)
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
-- fetch account limits and set max upload size accordingly -- fetch account limits and set max upload size accordingly
local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true }) local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true })
@ -441,7 +441,7 @@ server {
end end
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true }) local res = ngx.location.capture("/accounts/user/limits", { copy_all_vars = true })
if res.status == ngx.HTTP_OK then if res.status == ngx.HTTP_OK then
@ -527,7 +527,7 @@ server {
content_by_lua_block { content_by_lua_block {
local json = require('cjson') local json = require('cjson')
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then if os.getenv("ACCOUNTS_ENABLED") ~= "true" then
ngx.say(json.encode{authenticated = false}) ngx.say(json.encode{authenticated = false})
return ngx.exit(ngx.HTTP_OK) return ngx.exit(ngx.HTTP_OK)
end end

View File

@ -1,7 +1,7 @@
# register the download in accounts service (cookies should contain jwt) # register the download in accounts service (cookies should contain jwt)
log_by_lua_block { log_by_lua_block {
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
local skylink = ngx.header["Skynet-Skylink"] local skylink = ngx.header["Skynet-Skylink"]
if skylink and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then if skylink and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then

View File

@ -1,7 +1,7 @@
# register the registry access in accounts service (cookies should contain jwt) # register the registry access in accounts service (cookies should contain jwt)
log_by_lua_block { log_by_lua_block {
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
if ngx.status == ngx.HTTP_OK or ngx.status == ngx.HTTP_NOT_FOUND then if ngx.status == ngx.HTTP_OK or ngx.status == ngx.HTTP_NOT_FOUND then
local http = require("socket.http") local http = require("socket.http")

View File

@ -1,7 +1,7 @@
# register the upload in accounts service (cookies should contain jwt) # register the upload in accounts service (cookies should contain jwt)
log_by_lua_block { log_by_lua_block {
-- this block runs only when accounts are enabled -- this block runs only when accounts are enabled
if os.getenv("ACCOUNTS_ENABLED", "0") == "0" then return end if os.getenv("ACCOUNTS_ENABLED") ~= "true" then return end
local skylink = ngx.header["Skynet-Skylink"] local skylink = ngx.header["Skynet-Skylink"]
if skylink and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then if skylink and ngx.status >= ngx.HTTP_OK and ngx.status < ngx.HTTP_SPECIAL_RESPONSE then

View File

@ -166,7 +166,7 @@ const checks = [
directServerApiAccessCheck, directServerApiAccessCheck,
]; ];
if (process.env.ACCOUNTS_ENABLED === "1") { if (process.env.ACCOUNTS_ENABLED === "true") {
checks.push(accountHealthCheck, accountWebsiteCheck); checks.push(accountHealthCheck, accountWebsiteCheck);
} }

View File

@ -4,7 +4,7 @@ if (!process.env.SKYNET_PORTAL_API) {
throw new Error("You need to provide SKYNET_PORTAL_API environment variable"); throw new Error("You need to provide SKYNET_PORTAL_API environment variable");
} }
if (process.env.ACCOUNTS_ENABLED === "1" && !process.env.SKYNET_DASHBOARD_URL) { if (process.env.ACCOUNTS_ENABLED === "true" && !process.env.SKYNET_DASHBOARD_URL) {
throw new Error("You need to provide SKYNET_DASHBOARD_URL environment variable when accounts are enabled"); throw new Error("You need to provide SKYNET_DASHBOARD_URL environment variable when accounts are enabled");
} }