From d3be15dc03ef9fc99639d6a68218d7c92844a8ee Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 15 Feb 2022 12:46:57 +0100 Subject: [PATCH] remove unnecessary portal name env var --- docker-compose.jaeger.yml | 2 +- setup-scripts/README.md | 1 - setup-scripts/setup-docker-services.sh | 3 +-- setup-scripts/support/sia.env | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docker-compose.jaeger.yml b/docker-compose.jaeger.yml index 297d466a..0e23c251 100644 --- a/docker-compose.jaeger.yml +++ b/docker-compose.jaeger.yml @@ -10,7 +10,7 @@ services: sia: environment: - JAEGER_DISABLED=${JAEGER_DISABLED:-false} # Enable/Disable tracing - - JAEGER_SERVICE_NAME=${PORTAL_NAME:-Skyd} # change to e.g. eu-ger-1 + - JAEGER_SERVICE_NAME=${SERVER_DOMAIN:-Skyd} # change to e.g. eu-ger-1 # Configuration # See https://github.com/jaegertracing/jaeger-client-go#environment-variables # for all options. diff --git a/setup-scripts/README.md b/setup-scripts/README.md index d03e398f..1d032795 100644 --- a/setup-scripts/README.md +++ b/setup-scripts/README.md @@ -102,7 +102,6 @@ At this point we have almost everything running, we just need to set up your wal - `CLOUDFLARE_AUTH_TOKEN` (optional) if using cloudflare as dns loadbalancer (need to change it in Caddyfile too) - `AWS_ACCESS_KEY_ID` (optional) if using route53 as a dns loadbalancer - `AWS_SECRET_ACCESS_KEY` (optional) if using route53 as a dns loadbalancer - - `PORTAL_NAME` a string representing name of your portal e.g. `siasky.xyz` or `my skynet portal` - `DISCORD_WEBHOOK_URL` (required if using Discord notifications) discord webhook url (generate from discord app) - `DISCORD_MENTION_USER_ID` (optional) add `/cc @user` mention to important messages from webhook (has to be id not user name) - `DISCORD_MENTION_ROLE_ID` (optional) add `/cc @role` mention to important messages from webhook (has to be id not role name) diff --git a/setup-scripts/setup-docker-services.sh b/setup-scripts/setup-docker-services.sh index ff649401..2bd8c5ae 100755 --- a/setup-scripts/setup-docker-services.sh +++ b/setup-scripts/setup-docker-services.sh @@ -31,7 +31,6 @@ docker-compose --version # sanity check # * AWS_ACCESS_KEY_ID - (optional) if using route53 as a dns loadbalancer # * AWS_SECRET_ACCESS_KEY - (optional) if using route53 as a dns loadbalancer # * API_PORT - (optional) the port on which siad is listening, defaults to 9980 -# * PORTAL_NAME - a string representing name of your portal e.g. `siasky.xyz` or `my skynet portal` (internal use only) # * DISCORD_WEBHOOK_URL - (required if using Discord notifications) discord webhook url (generate from discord app) # * DISCORD_MENTION_USER_ID - (optional) add `/cc @user` mention to important messages from webhook (has to be id not user name) # * DISCORD_MENTION_ROLE_ID - (optional) add `/cc @role` mention to important messages from webhook (has to be id not role name) @@ -44,7 +43,7 @@ docker-compose --version # sanity check # * COOKIE_ENC_KEY - (optional) if using `accounts` encryption key, at least 32 bytes if ! [ -f /home/user/skynet-webportal/.env ]; then HSD_API_KEY=$(openssl rand -base64 32) # generate safe random key for handshake - printf "PORTAL_DOMAIN=siasky.net\nSERVER_DOMAIN=\nSKYNET_PORTAL_API=https://siasky.net\nSKYNET_SERVER_API=https://eu-dc-1.siasky.net\nEMAIL_ADDRESS=email@example.com\nSIA_WALLET_PASSWORD=\nHSD_API_KEY=${HSD_API_KEY}\nCLOUDFLARE_AUTH_TOKEN=\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nPORTAL_NAME=\DISCORD_WEBHOOK_URL=\nDISCORD_MENTION_USER_ID=\nDISCORD_MENTION_ROLE_ID=\n" > /home/user/skynet-webportal/.env + printf "PORTAL_DOMAIN=siasky.net\nSERVER_DOMAIN=\nSKYNET_PORTAL_API=https://siasky.net\nSKYNET_SERVER_API=https://eu-dc-1.siasky.net\nEMAIL_ADDRESS=email@example.com\nSIA_WALLET_PASSWORD=\nHSD_API_KEY=${HSD_API_KEY}\nCLOUDFLARE_AUTH_TOKEN=\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nDISCORD_WEBHOOK_URL=\nDISCORD_MENTION_USER_ID=\nDISCORD_MENTION_ROLE_ID=\n" > /home/user/skynet-webportal/.env fi # Start docker container with nginx and client diff --git a/setup-scripts/support/sia.env b/setup-scripts/support/sia.env index 03372c65..e0c95626 100644 --- a/setup-scripts/support/sia.env +++ b/setup-scripts/support/sia.env @@ -6,7 +6,6 @@ SIA_WALLET_PASSWORD="" # portal specific environment variables API_PORT="9980" -PORTAL_NAME="" # discord integration DISCORD_WEBHOOK_URL=""